diff --git a/boot.php b/boot.php
index 6864e533d8..cd7fa03b59 100644
--- a/boot.php
+++ b/boot.php
@@ -12,10 +12,9 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.1.1572' );
+define ( 'FRIENDICA_VERSION',      '3.1.1589' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1159      );
-
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
 
@@ -385,8 +384,14 @@ if(! class_exists('App')) {
 			'template_engine' => 'internal',
 		);
 
-		public $smarty3_ldelim = '{{';
-		public $smarty3_rdelim = '}}';
+		private $ldelim = array(
+			'internal' => '',
+			'smarty3' => '{{'
+		);
+		private $rdelim = array(
+			'internal' => '',
+			'smarty3' => '}}'
+		);
 
 		private $scheme;
 		private $hostname;
@@ -617,17 +622,17 @@ if(! class_exists('App')) {
 			 */
 			if(!isset($this->page['htmlhead']))
 				$this->page['htmlhead'] = '';
-			$tpl = get_markup_template('head.tpl');
 
 			// If we're using Smarty, then doing replace_macros() will replace
 			// any unrecognized variables with a blank string. Since we delay
 			// replacing $stylesheet until later, we need to replace it now
 			// with another variable name
 			if($this->theme['template_engine'] === 'smarty3')
-				$stylesheet = $this->smarty3_ldelim . '$stylesheet' . $this->smarty3_rdelim;
+				$stylesheet = $this->get_template_ldelim('smarty3') . '$stylesheet' . $this->get_template_rdelim('smarty3');
 			else
 				$stylesheet = '$stylesheet';
 
+			$tpl = get_markup_template('head.tpl');
 			$this->page['htmlhead'] = replace_macros($tpl,array(
 				'$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!!
 				'$local_user' => local_user(),
@@ -688,6 +693,31 @@ if(! class_exists('App')) {
 			return $this->cached_profile_image[$avatar_image];
 		}
 
+		function get_template_engine() {
+			return $this->theme['template_engine'];
+		}
+
+		function set_template_engine($engine = 'internal') {
+
+			$this->theme['template_engine'] = 'internal';
+
+			switch($engine) {
+				case 'smarty3':
+					if(is_writable('view/smarty3/'))
+						$this->theme['template_engine'] = 'smarty3';
+					break;
+				default:
+					break;
+			}
+		}
+
+		function get_template_ldelim($engine = 'internal') {
+			return $this->ldelim[$engine];
+		}
+
+		function get_template_rdelim($engine = 'internal') {
+			return $this->rdelim[$engine];
+		}
 
 	}
 }
@@ -776,16 +806,12 @@ function is_ajax() {
 
 // Primarily involved with database upgrade, but also sets the
 // base url for use in cmdline programs which don't have
-// $_SERVER variables, and synchronising the state of installed plugins.
+// $_SERVER variables
 
 
 if(! function_exists('check_config')) {
 	function check_config(&$a) {
 
-		$build = get_config('system','build');
-		if(! x($build))
-			$build = set_config('system','build',DB_UPDATE_VERSION);
-
 		$url = get_config('system','url');
 
 		// if the url isn't set or the stored url is radically different
@@ -800,6 +826,10 @@ if(! function_exists('check_config')) {
 			$url = set_config('system','url',$a->get_baseurl());
 
 
+		$build = get_config('system','build');
+		if(! x($build))
+			$build = set_config('system','build',DB_UPDATE_VERSION);
+
 		if($build != DB_UPDATE_VERSION) {
 			$stored = intval($build);
 			$current = intval(DB_UPDATE_VERSION);
@@ -848,9 +878,10 @@ if(! function_exists('check_config')) {
 									'$error' => sprintf( t('Update %s failed. See error logs.'), $x)
 								));
 								$subject=sprintf(t('Update Error at %s'), $a->get_baseurl());
-									
+								require_once('include/email.php');
+								$subject = email_header_encode($subject,'UTF-8');	
 								mail($a->config['admin_email'], $subject, $email_msg,
-									'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+									'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n"
 									. 'Content-type: text/plain; charset=UTF-8' . "\n"
 									. 'Content-transfer-encoding: 8bit' );
 								//try the logger
@@ -867,6 +898,14 @@ if(! function_exists('check_config')) {
 			}
 		}
 
+		return;
+	}
+}
+
+
+if(! function_exists('check_plugins')) {
+	function check_plugins(&$a) {
+
 		/**
 		 *
 		 * Synchronise plugins:
@@ -1108,6 +1147,10 @@ if(! function_exists('get_max_import_size')) {
  * Profile information is placed in the App structure for later retrieval.
  * Honours the owner's chosen theme for display.
  *
+ * IMPORTANT: Should only be run in the _init() functions of a module. That ensures that
+ * the theme is chosen before the _init() function of a theme is run, which will usually
+ * load a lot of theme-specific content
+ *
  */
 
 if(! function_exists('profile_load')) {
@@ -1167,7 +1210,7 @@ if(! function_exists('profile_load')) {
 
 		if(! $r[0]['is-default']) {
 			$x = q("select `pub_keywords` from `profile` where uid = %d and `is-default` = 1 limit 1",
-					intval($profile_uid)
+					intval($r[0]['profile_uid'])
 			);
 			if($x && count($x))
 				$r[0]['pub_keywords'] = $x[0]['pub_keywords'];
@@ -1175,7 +1218,7 @@ if(! function_exists('profile_load')) {
 
 		$a->profile = $r[0];
 
-		$a->profile['mobile-theme'] = get_pconfig($profile_uid, 'system', 'mobile_theme');
+		$a->profile['mobile-theme'] = get_pconfig($a->profile['profile_uid'], 'system', 'mobile_theme');
 
 
 		$a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename'];
@@ -1186,6 +1229,8 @@ if(! function_exists('profile_load')) {
 		 * load/reload current theme info
 		 */
 
+		$a->set_template_engine(); // reset the template engine to the default in case the user's theme doesn't specify one
+
 		$theme_info_file = "view/theme/".current_theme()."/theme.php";
 		if (file_exists($theme_info_file)){
 			require_once($theme_info_file);
@@ -1344,8 +1389,6 @@ if(! function_exists('profile_sidebar')) {
 		}
 
 
-		$tpl = get_markup_template('profile_vcard.tpl');
-
 		$p = array();
 		foreach($profile as $k => $v) {
 			$k = str_replace('-','_',$k);
@@ -1355,6 +1398,7 @@ if(! function_exists('profile_sidebar')) {
 		if($a->theme['template_engine'] === 'internal')
 			$location = template_escape($location);
 
+		$tpl = get_markup_template('profile_vcard.tpl');
 		$o .= replace_macros($tpl, array(
 			'$profile' => $p,
 			'$connect'  => $connect,
@@ -1612,7 +1656,7 @@ if(! function_exists('current_theme')) {
 //		$mobile_detect = new Mobile_Detect();
 //		$is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
 		$is_mobile = $a->is_mobile || $a->is_tablet;
-	
+
 		if($is_mobile) {
 			if(isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
 				$system_theme = '';
@@ -1947,16 +1991,9 @@ function clear_cache($basepath = "", $path = "") {
 }
 
 function set_template_engine(&$a, $engine = 'internal') {
+// This function is no longer necessary, but keep it as a wrapper to the class method
+// to avoid breaking themes again unnecessarily
 
-	$a->theme['template_engine'] = 'internal';
-
-	if(is_writable('view/smarty3/')) {
-		switch($engine) {
-			case 'smarty3':
-				$a->theme['template_engine'] = 'smarty3';
-				break;
-			default:
-				break;
-		}
-	}
+	$a->set_template_engine($engine);
 }
+
diff --git a/database.sql b/database.sql
index 99d60429ae..cf060ebf49 100644
--- a/database.sql
+++ b/database.sql
@@ -241,6 +241,20 @@ CREATE TABLE IF NOT EXISTS `deliverq` (
 
 -- --------------------------------------------------------
 
+--
+-- Table structure for table `dsprphotoq`
+--
+
+CREATE TABLE `dsprphotoq` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `uid` int(11) NOT NULL,
+  `msg` mediumtext NOT NULL,
+  `attempt` tinyint(4) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
 --
 -- Table structure for table `event`
 --
diff --git a/include/attach.php b/include/attach.php
index 6d611cec04..079911ffa3 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -42,6 +42,10 @@ function z_mime_content_type($filename) {
 		'qt' => 'video/quicktime',
 		'mov' => 'video/quicktime',
 		'ogg' => 'application/ogg',
+		'mp4' => 'video/mp4',
+		'avi' => 'video/x-msvideo',
+		'wmv' => 'video/x-ms-wmv',
+		'wma' => 'audio/x-ms-wma',
 
 		// adobe
 		'pdf' => 'application/pdf',
diff --git a/include/bbcode.php b/include/bbcode.php
index a7cfa079d1..613c2b7db0 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -254,12 +254,22 @@ function bb_ShareAttributes($match) {
         if ($matches[1] != "")
                 $profile = $matches[1];
 
+        $posted = "";
+        preg_match("/posted='(.*?)'/ism", $attributes, $matches);
+        if ($matches[1] != "")
+                $posted = $matches[1];
+
+        preg_match('/posted="(.*?)"/ism', $attributes, $matches);
+        if ($matches[1] != "")
+                $posted = $matches[1];
+		$reldate = (($posted) ? " " . relative_date($posted) : ''); 
+
         $headline = '<div class="shared_header">';
 
 	if ($avatar != "")
 		$headline .= '<img src="'.$avatar.'" height="32" width="32" >';
 
-	$headline .= sprintf(t('<span><a href="%s" target="external-link">%s</a> wrote the following <a href="%s" target="external-link">post</a>:</span>'), $profile, $author, $link);
+	$headline .= sprintf(t('<span><a href="%s" target="external-link">%s</a> wrote the following <a href="%s" target="external-link">post</a>'.$reldate.':</span>'), $profile, $author, $link);
 
         $headline .= "</div>";
 
@@ -312,6 +322,9 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 	$Text = preg_replace("/\s?\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","[share$1]$2[/share]",$Text);
 	$Text = preg_replace("/\s?\[quote(.*?)\]\s?(.*?)\s?\[\/quote\]\s?/ism","[quote$1]$2[/quote]",$Text);
 
+	$Text = preg_replace("/\n\[code\]/ism", "[code]", $Text);
+	$Text = preg_replace("/\[\/code\]\n/ism", "[/code]", $Text);
+
 	// when the content is meant exporting to other systems then remove the avatar picture since this doesn't really look good on these systems
 	if (!$tryoembed)
 		$Text = preg_replace("/\[share(.*?)avatar\s?=\s?'.*?'\s?(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","\n[share$1$2]$3[/share]",$Text);
@@ -327,12 +340,13 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 	$Text = str_replace("\r\n","\n", $Text);
 
 	// removing multiplicated newlines
-	$search = array("\n\n\n", "\n ", " \n", "[/quote]\n\n", "\n[/quote]");
-	$replace = array("\n\n", "\n", "\n", "[/quote]\n", "[/quote]");
-	do {
-		$oldtext = $Text;
-		$Text = str_replace($search, $replace, $Text);
-	} while ($oldtext != $Text);
+//	$search = array("\n\n\n", "\n ", " \n", "[/quote]\n\n", "\n[/quote]");
+//	$replace = array("\n\n", "\n", "\n", "[/quote]\n", "[/quote]");
+//	do {
+//		$oldtext = $Text;
+//		$Text = str_replace($search, $replace, $Text);
+//	} while ($oldtext != $Text);
+
 
 	$Text = str_replace(array("\r","\n"), array('<br />','<br />'), $Text);
 
diff --git a/include/conversation.php b/include/conversation.php
index 7665342739..cc66d380b7 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -524,7 +524,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 				$hashtags = array();
 				$mentions = array();
 
-				$taglist = q("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d)",
+				$taglist = q("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d) ORDER BY `tid`",
 						intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION));
 
 				foreach($taglist as $tag) {
@@ -896,26 +896,21 @@ function format_like($cnt,$arr,$type,$id) {
 	if($cnt == 1)
 		$o .= (($type === 'like') ? sprintf( t('%s likes this.'), $arr[0]) : sprintf( t('%s doesn\'t like this.'), $arr[0])) . EOL ;
 	else {
-		//$spanatts = 'class="fakelink" onclick="openClose(\'' . $type . 'list-' . $id . '\');"';
+		$spanatts = "class=\"fakelink\" onclick=\"openClose('{$type}list-$id');\"";
 		switch($type) {
 			case 'like':
-//				$phrase = sprintf( t('<span  %1$s>%2$d people</span> like this.'), $spanatts, $cnt);
-				$mood = t('like this');
+				$phrase = sprintf( t('<span  %1$s>%2$d people</span> like this'), $spanatts, $cnt);
 				break;
 			case 'dislike':
-//				$phrase = sprintf( t('<span  %1$s>%2$d people</span> don\'t like this.'), $spanatts, $cnt);
-				$mood = t('don\'t like this');
+				$phrase = sprintf( t('<span  %1$s>%2$d people</span> don\'t like this'), $spanatts, $cnt);
 				break;
 		}
-		$tpl = get_markup_template("voting_fakelink.tpl");
-		$phrase = replace_macros($tpl, array(
-			'$vote_id' => $type . 'list-' . $id,
-			'$count' => $cnt,
-			'$people' => t('people'),
-			'$vote_mood' => $mood
+		$phrase .= EOL ;
+		$o .= replace_macros(get_markup_template('voting_fakelink.tpl'), array(
+			'$phrase' => $phrase,
+			'$type' => $type,
+			'$id' => $id
 		));
-		$o .= $phrase;
-//		$o .= EOL ;
 
 		$total = count($arr);
 		if($total >= MAX_LIKERS)
diff --git a/include/dbupdate.php b/include/dbupdate.php
new file mode 100644
index 0000000000..6ae1bf10e7
--- /dev/null
+++ b/include/dbupdate.php
@@ -0,0 +1,29 @@
+<?php
+
+require_once("boot.php");
+
+function dbupdate_run(&$argv, &$argc) {
+	global $a, $db;
+
+	if(is_null($a)){
+		$a = new App;
+	}
+  
+	if(is_null($db)) {
+		@include(".htconfig.php");
+		require_once("include/dba.php");
+		$db = new dba($db_host, $db_user, $db_pass, $db_data);
+		        unset($db_host, $db_user, $db_pass, $db_data);
+	}
+
+	load_config('config');
+	load_config('system');
+
+	check_config($a);
+}
+
+if (array_search(__file__,get_included_files())===0){
+  dbupdate_run($argv,$argc);
+  killme();
+}
+
diff --git a/include/diaspora.php b/include/diaspora.php
index 8e77f03336..5bf45e241f 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -16,7 +16,9 @@ function diaspora_dispatch_public($msg) {
 		return;
 	}
 
-	$r = q("SELECT `user`.* FROM `user` WHERE `user`.`uid` IN ( SELECT `contact`.`uid` FROM `contact` WHERE `contact`.`network` = '%s' AND `contact`.`addr` = '%s' ) AND `account_expired` = 0 AND `account_removed` = 0 ",
+	$r = q("SELECT `user`.* FROM `user` WHERE `user`.`uid` IN
+	        ( SELECT `contact`.`uid` FROM `contact` WHERE `contact`.`network` = '%s' AND `contact`.`addr` = '%s' )
+	        AND `account_expired` = 0 AND `account_removed` = 0 ",
 		dbesc(NETWORK_DIASPORA),
 		dbesc($msg['author'])
 	);
@@ -32,7 +34,7 @@ function diaspora_dispatch_public($msg) {
 
 
 
-function diaspora_dispatch($importer,$msg) {
+function diaspora_dispatch($importer,$msg,$attempt=1) {
 
 	$ret = 0;
 
@@ -88,7 +90,7 @@ function diaspora_dispatch($importer,$msg) {
 		$ret = diaspora_signed_retraction($importer,$xmlbase->relayable_retraction,$msg);
 	}
 	elseif($xmlbase->photo) {
-		$ret = diaspora_photo($importer,$xmlbase->photo,$msg);
+		$ret = diaspora_photo($importer,$xmlbase->photo,$msg,$attempt);
 	}
 	elseif($xmlbase->conversation) {
 		$ret = diaspora_conversation($importer,$xmlbase->conversation,$msg);
@@ -1669,7 +1671,7 @@ function diaspora_message($importer,$xml,$msg) {
 }
 
 
-function diaspora_photo($importer,$xml,$msg) {
+function diaspora_photo($importer,$xml,$msg,$attempt=1) {
 
 	$a = get_app();
 
@@ -1707,7 +1709,14 @@ function diaspora_photo($importer,$xml,$msg) {
 		dbesc($status_message_guid)
 	);
 	if(! count($r)) {
-		logger('diaspora_photo: parent item not found: parent: ' . $parent_guid . ' item: ' . $guid);
+		if($attempt <= 3) {
+			q("INSERT INTO dsprphotoq (uid, msg, attempt) VALUES (%d, '%s', %d)",
+			   intval($importer['uid']),
+			   dbesc(serialize($msg)),
+			   intval($attempt + 1)
+			);
+		}
+		logger('diaspora_photo: attempt = ' . $attempt . '; status message not found: ' . $status_message_guid . ' for photo: ' . $guid);
 		return;
 	}
 
@@ -2333,13 +2342,15 @@ function diaspora_send_followup($item,$owner,$contact,$public_batch = false) {
 	$myaddr = $owner['nickname'] . '@' .  substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
 //	$theiraddr = $contact['addr'];
 
-	// Diaspora doesn't support threaded comments
-	/*if($item['thr-parent']) {
+	// Diaspora doesn't support threaded comments, but some
+	// versions of Diaspora (i.e. Diaspora-pistos) support
+	// likes on comments
+	if($item['verb'] === ACTIVITY_LIKE && $item['thr-parent']) {
 		$p = q("select guid, type, uri, `parent-uri` from item where uri = '%s' limit 1",
 		        dbesc($item['thr-parent'])
 		      );
 	}
-	else {*/
+	else {
 		// The first item in the `item` table with the parent id is the parent. However, MySQL doesn't always
 		// return the items ordered by `item`.`id`, in which case the wrong item is chosen as the parent.
 		// The only item with `parent` and `id` as the parent id is the parent item.
@@ -2347,7 +2358,7 @@ function diaspora_send_followup($item,$owner,$contact,$public_batch = false) {
 			intval($item['parent']),
 			intval($item['parent'])
 		);
-	//}
+	}
 	if(count($p))
 		$parent = $p[0];
 	else
@@ -2409,13 +2420,15 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
 	$body = $item['body'];
 	$text = html_entity_decode(bb2diaspora($body));
 
-	// Diaspora doesn't support threaded comments
-	/*if($item['thr-parent']) {
+	// Diaspora doesn't support threaded comments, but some
+	// versions of Diaspora (i.e. Diaspora-pistos) support
+	// likes on comments
+	if($item['verb'] === ACTIVITY_LIKE && $item['thr-parent']) {
 		$p = q("select guid, type, uri, `parent-uri` from item where uri = '%s' limit 1",
 		        dbesc($item['thr-parent'])
 		      );
 	}
-	else {*/
+	else {
 		// The first item in the `item` table with the parent id is the parent. However, MySQL doesn't always
 		// return the items ordered by `item`.`id`, in which case the wrong item is chosen as the parent.
 		// The only item with `parent` and `id` as the parent id is the parent item.
@@ -2423,7 +2436,7 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
 		       intval($item['parent']),
 		       intval($item['parent'])
 		      );
-	//}
+	}
 	if(count($p))
 		$parent = $p[0];
 	else
diff --git a/include/dsprphotoq.php b/include/dsprphotoq.php
new file mode 100644
index 0000000000..06e733d79c
--- /dev/null
+++ b/include/dsprphotoq.php
@@ -0,0 +1,50 @@
+<?php
+require_once("boot.php");
+require_once('include/diaspora.php');
+
+function dsprphotoq_run($argv, $argc){
+	global $a, $db;
+
+	if(is_null($a)){
+		$a = new App;
+	}
+  
+	if(is_null($db)){
+		@include(".htconfig.php");
+		require_once("include/dba.php");
+		$db = new dba($db_host, $db_user, $db_pass, $db_data);
+		unset($db_host, $db_user, $db_pass, $db_data);
+	};
+
+	logger("diaspora photo queue: running", LOGGER_DEBUG);
+
+	$r = q("SELECT * FROM dsprphotoq");
+	if(!$r)
+		return;
+
+	$dphotos = $r;
+
+	logger("diaspora photo queue: processing " . count($dphotos) . " photos");
+
+	foreach($dphotos as $dphoto) {
+
+		$r = q("SELECT * FROM user WHERE uid = %d",
+			intval($dphoto['uid'])
+		);
+		if(!$r) {
+			logger("diaspora photo queue: user " . $dphoto['uid'] . " not found");
+			return;
+		}
+
+		$ret = diaspora_dispatch($r[0],unserialize($dphoto['msg']),$dphoto['attempt']);
+		q("DELETE FROM dsprphotoq WHERE id = %d",
+		   intval($dphoto['id'])
+		);
+	}
+}
+
+
+if (array_search(__file__,get_included_files())===0){
+  dsprphotoq_run($argv,$argc);
+  killme();
+}
diff --git a/include/enotify.php b/include/enotify.php
index ba947a9bf9..9c405c101b 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -471,8 +471,8 @@ class enotify {
 		// generate a multipart/alternative message header
 		$messageHeader =
 			$params['additionalMailHeader'] .
-			"From: {$params['fromName']} <{$params['fromEmail']}>\n" . 
-			"Reply-To: {$params['fromName']} <{$params['replyTo']}>\n" .
+			"From: $fromName <{$params['fromEmail']}>\n" . 
+			"Reply-To: $fromName <{$params['replyTo']}>\n" .
 			"MIME-Version: 1.0\n" .
 			"Content-Type: multipart/alternative; boundary=\"{$mimeBoundary}\"";
 
@@ -493,7 +493,7 @@ class enotify {
 		// send the message
 		$res = mail(
 			$params['toEmail'],	 									// send to address
-			$params['messageSubject'],								// subject
+			$messageSubject,								// subject
 			$multipartMessageBody,	 						// message body
 			$messageHeader									// message headers
 		);
diff --git a/include/friendica_smarty.php b/include/friendica_smarty.php
index 9ad14ad8a4..b3f0d18a01 100644
--- a/include/friendica_smarty.php
+++ b/include/friendica_smarty.php
@@ -24,8 +24,11 @@ class FriendicaSmarty extends Smarty {
 		$this->setConfigDir('view/smarty3/config/');
 		$this->setCacheDir('view/smarty3/cache/');
 
-		$this->left_delimiter = $a->smarty3_ldelim;
-		$this->right_delimiter = $a->smarty3_rdelim;
+		$this->left_delimiter = $a->get_template_ldelim('smarty3');
+		$this->right_delimiter = $a->get_template_rdelim('smarty3');
+
+		// Don't report errors so verbosely
+		$this->error_reporting = E_ALL & ~E_NOTICE;
 	}
 
 	function parsed($template = '') {
diff --git a/include/html2plain.php b/include/html2plain.php
index bafaadd8d7..572f9714a3 100644
--- a/include/html2plain.php
+++ b/include/html2plain.php
@@ -209,7 +209,7 @@ function html2plain($html, $wraplength = 75, $compact = false)
 	if (!$compact) {
 		$counter = 1;
 		foreach ($urls as $id=>$url)
-			if (strpos($message, $url) == false)
+			if (strpos($message, $url) === false)
 				$message .= "\n".$url." ";
 				//$message .= "\n[".($counter++)."] ".$url;
 	}
diff --git a/include/items.php b/include/items.php
index b93f56e179..54b392b386 100755
--- a/include/items.php
+++ b/include/items.php
@@ -6,6 +6,8 @@ require_once('include/salmon.php');
 require_once('include/crypto.php');
 require_once('include/Photo.php');
 require_once('include/tags.php');
+require_once('include/text.php');
+require_once('include/email.php');
 
 function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) {
 
@@ -238,7 +240,7 @@ function construct_activity_object($item) {
 					$r->link = str_replace('&','&amp;', $r->link);
 				$r->link = preg_replace('/\<link(.*?)\"\>/','<link$1"/>',$r->link);
 				$o .= $r->link;
-			}					
+			}
 			else
 				$o .= '<link rel="alternate" type="text/html" href="' . xmlify($r->link) . '" />' . "\r\n";
 		}
@@ -270,7 +272,7 @@ function construct_activity_target($item) {
 					$r->link = str_replace('&','&amp;', $r->link);
 				$r->link = preg_replace('/\<link(.*?)\"\>/','<link$1"/>',$r->link);
 				$o .= $r->link;
-			}					
+			}
 			else
 				$o .= '<link rel="alternate" type="text/html" href="' . xmlify($r->link) . '" />' . "\r\n";
 		}
@@ -882,7 +884,7 @@ function item_store($arr,$force_parent = false) {
 		$arr['gravity'] = 0;
 	elseif(activity_match($arr['verb'],ACTIVITY_POST))
 		$arr['gravity'] = 6;
-	else      
+	else
 		$arr['gravity'] = 6;   // extensible catchall
 
 	if(! x($arr,'type'))
@@ -1072,10 +1074,9 @@ function item_store($arr,$force_parent = false) {
 
 	if(count($r)) {
 		$current_post = $r[0]['id'];
-		create_tags_from_item($r[0]['id']);
 		logger('item_store: created item ' . $current_post);
-	}
-	else {
+		create_tags_from_item($r[0]['id']);
+	} else {
 		logger('item_store: could not locate created item');
 		return 0;
 	}
@@ -1153,6 +1154,15 @@ function item_store($arr,$force_parent = false) {
 
 	tag_deliver($arr['uid'],$current_post);
 
+	// Store the fresh generated item into the cache
+	$cachefile = get_cachefile($arr["guid"]."-".hash("md5", $arr['body']));
+
+	if (($cachefile != '') AND !file_exists($cachefile)) {
+		$s = prepare_text($arr['body']);
+		file_put_contents($cachefile, $s);
+		logger('item_store: put item '.$current_post.' into cachefile '.$cachefile);
+	}
+
 	return $current_post;
 }
 
@@ -3401,9 +3411,9 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
 					'$sitename' => $a->config['sitename']
 				));
 				$res = mail($r[0]['email'], 
-					(($sharing) ? t('A new person is sharing with you at ') : t("You have a new follower at ")) . $a->config['sitename'],
+					email_header_encode((($sharing) ? t('A new person is sharing with you at ') : t("You have a new follower at ")) . $a->config['sitename'],'UTF-8'),
 					$email,
-					'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+					'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n"
 					. 'Content-type: text/plain; charset=UTF-8' . "\n"
 					. 'Content-transfer-encoding: 8bit' );
 
@@ -3763,11 +3773,11 @@ function item_getfeedtags($item) {
 
 function item_getfeedattach($item) {
 	$ret = '';
-	$arr = explode(',',$item['attach']);
+	$arr = explode('[/attach],',$item['attach']);
 	if(count($arr)) {
 		foreach($arr as $r) {
 			$matches = false;
-			$cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches);
+			$cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|',$r,$matches);
 			if($cnt) {
 				$ret .= '<link rel="enclosure" href="' . xmlify($matches[1]) . '" type="' . xmlify($matches[3]) . '" ';
 				if(intval($matches[2]))
diff --git a/include/notifier.php b/include/notifier.php
index 367f78700c..a3286355dd 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -37,6 +37,7 @@ require_once('include/html2plain.php');
  *		tag						(in photos.php, poke.php, tagger.php)
  *		tgroup					(in items.php)
  *		wall-new				(in photos.php, item.php)
+ *		removeme				(in Contact.php)
  *
  * and ITEM_ID is the id of the item in the database that needs to be sent to others.
  */
@@ -138,14 +139,17 @@ function notifier_run(&$argv, &$argc){
 		$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($item_id));
 		if (! $r)
 			return;
+
 		$user = $r[0];
 		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1", intval($item_id));
 		if (! $r)
 			return;
+
 		$self = $r[0];
 		$r = q("SELECT * FROM `contact` WHERE `self` = 0 AND `uid` = %d", intval($item_id));
 		if(! $r)
 			return;
+
 		require_once('include/Contact.php');
 		foreach($r as $contact) {
 			terminate_friendship($user, $self, $contact);
diff --git a/include/poller.php b/include/poller.php
index cc5f2a9834..c9c46188f6 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -62,6 +62,10 @@ function poller_run(&$argv, &$argc){
 
 	proc_run('php',"include/queue.php");
 
+	// run diaspora photo queue process in the background
+
+	proc_run('php',"include/dsprphotoq.php");
+
 	// expire any expired accounts
 
 	q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0 
diff --git a/include/socgraph.php b/include/socgraph.php
index 4fe9eaf909..45048d8da5 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -2,7 +2,6 @@
 
 require_once('include/datetime.php');
 
-
 /*
  * poco_load
  *
diff --git a/include/tags.php b/include/tags.php
index 6a5728a9ba..b02adc3d83 100644
--- a/include/tags.php
+++ b/include/tags.php
@@ -25,7 +25,7 @@ function create_tags_from_item($itemid) {
 
 	$searchpath = $a->get_baseurl()."/search?tag=";
 
-	$messages = q("SELECT `uri`, `uid`, `id`, `created`, `edited`, `commented`, `received`, `changed`, `deleted`, `title`, `body`, `tag` FROM `item` WHERE `id` = %d LIMIT 1", intval($itemid));
+	$messages = q("SELECT `guid`, `uid`, `id`, `edited`, `deleted`, `title`, `body`, `tag` FROM `item` WHERE `id` = %d LIMIT 1", intval($itemid));
 
 	if (!$messages)
 		return;
@@ -42,6 +42,14 @@ function create_tags_from_item($itemid) {
 	if ($message["deleted"])
 		return;
 
+	$cachefile = get_cachefile($message["guid"]."-".hash("md5", $message['body']));
+
+	if (($cachefile != '') AND !file_exists($cachefile)) {
+		$s = prepare_text($message['body']);
+		file_put_contents($cachefile, $s);
+		logger('create_tags_from_item: put item '.$message["id"].' into cachefile '.$cachefile);
+	}
+
 	$taglist = explode(",", $message["tag"]);
 
 	$tags = "";
diff --git a/include/text.php b/include/text.php
index 5b64ef2f94..53dd06d1fd 100644
--- a/include/text.php
+++ b/include/text.php
@@ -23,7 +23,6 @@ function replace_macros($s,$r) {
 		if(gettype($s) === 'string') {
 			$template = $s;
 			$s = new FriendicaSmarty();
-			$s->error_reporting = E_ALL & ~E_NOTICE;
 		}
 		foreach($r as $key=>$value) {
 			if($key[0] === '$') {
@@ -490,12 +489,12 @@ function get_template_file($a, $filename, $root = '') {
 	if($root !== '' && $root[strlen($root)-1] !== '/')
 		$root = $root . '/';
 
-	if(file_exists($root . "view/theme/$theme/$filename"))
-		$template_file = $root . "view/theme/$theme/$filename";
-	elseif (x($a->theme_info,"extends") && file_exists($root . "view/theme/".$a->theme_info["extends"]."/$filename"))
-		$template_file = $root . "view/theme/".$a->theme_info["extends"]."/$filename";
+	if(file_exists("{$root}view/theme/$theme/$filename"))
+		$template_file = "{$root}view/theme/$theme/$filename";
+	elseif (x($a->theme_info,"extends") && file_exists("{$root}view/theme/{$a->theme_info["extends"]}/$filename"))
+		$template_file = "{$root}view/theme/{$a->theme_info["extends"]}/$filename";
 	else
-		$template_file = $root . "view/$filename";
+		$template_file = "{$root}view/$filename";
 
 	return $template_file;
 }}
@@ -1019,7 +1018,8 @@ function prepare_body($item,$attach = false) {
 	$a = get_app();
 	call_hooks('prepare_body_init', $item);
 
-	$cachefile = get_cachefile($item["guid"]."-".strtotime($item["edited"])."-".hash("crc32", $item['body']));
+	//$cachefile = get_cachefile($item["guid"]."-".strtotime($item["edited"])."-".hash("crc32", $item['body']));
+	$cachefile = get_cachefile($item["guid"]."-".hash("md5", $item['body']));
 
 	if (($cachefile != '')) {
 		if (file_exists($cachefile))
@@ -1027,6 +1027,7 @@ function prepare_body($item,$attach = false) {
 		else {
 			$s = prepare_text($item['body']);
 			file_put_contents($cachefile, $s);
+			logger('prepare_body: put item '.$item["id"].' into cachefile '.$cachefile);
 		}
 	} else
 		$s = prepare_text($item['body']);
@@ -1043,13 +1044,13 @@ function prepare_body($item,$attach = false) {
 		return $s;
 	}
 
-	$arr = explode(',',$item['attach']);
+	$arr = explode('[/attach],',$item['attach']);
 	if(count($arr)) {
 		$s .= '<div class="body-attach">';
 		foreach($arr as $r) {
 			$matches = false;
 			$icon = '';
-			$cnt = preg_match_all('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches, PREG_SET_ORDER);
+			$cnt = preg_match_all('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|',$r,$matches, PREG_SET_ORDER);
 			if($cnt) {
 				foreach($matches as $mtch) {
 					$icontype = strtolower(substr($mtch[3],0,strpos($mtch[3],'/')));
diff --git a/include/user.php b/include/user.php
index 282bbdbba2..6f4ab30215 100644
--- a/include/user.php
+++ b/include/user.php
@@ -7,6 +7,7 @@ require_once('include/text.php');
 require_once('include/pgettext.php');
 require_once('include/datetime.php');
 
+
 function create_user($arr) {
 
 	// Required: { username, nickname, email } or { openid_url }
diff --git a/index.php b/index.php
index dd19bb8336..0ea09c0c7a 100644
--- a/index.php
+++ b/index.php
@@ -1,5 +1,6 @@
 <?php
 
+
 /**
  *
  * Friendica
@@ -43,7 +44,7 @@ load_translation_table($lang);
 
 require_once("include/dba.php");
 
-if(! $install) {
+if(!$install) {
 	$db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
     	    unset($db_host, $db_user, $db_pass, $db_data);
 
@@ -59,6 +60,8 @@ if(! $install) {
 	call_hooks('init_1');
 }
 
+$maintenance = get_config('system', 'maintenance');
+
 
 /**
  *
@@ -89,7 +92,7 @@ if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
 	load_translation_table($lang);
 }
 
-if((x($_GET,'zrl')) && (! $install)) {
+if((x($_GET,'zrl')) && (!$install && !$maintenance)) {
 	$_SESSION['my_url'] = $_GET['zrl'];
 	$a->query_string = preg_replace('/[\?&]zrl=(.*?)([\?&]|$)/is','',$a->query_string);
 	zrl_init($a);
@@ -135,8 +138,12 @@ if(! x($_SESSION,'sysmsg_info'))
 
 if($install)
 	$a->module = 'install';
-else
-	check_config($a);
+elseif($maintenance)
+	$a->module = 'maintenance';
+else {
+	proc_run('php', 'include/dbupdate.php');
+	check_plugins($a);
+}
 
 nav_set_selected('nothing');
 
@@ -237,7 +244,7 @@ if (file_exists($theme_info_file)){
 if(! x($a->page,'content'))
 	$a->page['content'] = '';
 
-if(! $install)
+if(!$install && !$maintenance)
 	call_hooks('page_content_top',$a->page['content']);
 
 /**
@@ -372,20 +379,14 @@ $a->page['content'] .=  '<div id="pause"></div>';
  *
  */
 
-if($a->module != 'install') {
+if($a->module != 'install' && $a->module != 'maintenance') {
 	nav($a);
 }
 
 /**
- * Build the page - now that we have all the components
+ * Add a "toggle mobile" link if we're using a mobile device
  */
 
-if(!$a->theme['stylesheet'])
-	$stylesheet = current_theme_url();
-else
-	$stylesheet = $a->theme['stylesheet'];
-$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => $stylesheet));
-
 if($a->is_mobile || $a->is_tablet) {
 	if(isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
 		$link = $a->get_baseurl() . '/toggle_mobile?address=' . curPageURL();
@@ -399,6 +400,16 @@ if($a->is_mobile || $a->is_tablet) {
     	                 ));
 }
 
+/**
+ * Build the page - now that we have all the components
+ */
+
+if(!$a->theme['stylesheet'])
+	$stylesheet = current_theme_url();
+else
+	$stylesheet = $a->theme['stylesheet'];
+$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => $stylesheet));
+
 $page    = $a->page;
 $profile = $a->profile;
 
diff --git a/js/acl.js b/js/acl.js
index 36cf74970f..fc6a6c0c1d 100644
--- a/js/acl.js
+++ b/js/acl.js
@@ -253,10 +253,9 @@ ACL.prototype.populate = function(data){
 		//console.log(html);
 		that.list_content.append(html);
 	});
-	$(".acl-list-item img[data-src]").each(function(i, el){
-		// Replace data-src attribute with src attribute for every image
+	$(".acl-list-item img[data-src]", that.list_content).each(function(i, el){
+		// Add src attribute for images with a data-src attribute
 		$(el).attr('src', $(el).data("src"));
-		$(el).removeAttr("data-src");
 	});
 	that.update_view();
 }
diff --git a/js/acl.min.js b/js/acl.min.js
index 74904a02c0..b3ad459e96 100644
--- a/js/acl.min.js
+++ b/js/acl.min.js
@@ -1 +1 @@
-function ACL(e,t){that=this,that.url=e,that.kp_timer=null,t==undefined&&(t=[]),that.allow_cid=t[0]||[],that.allow_gid=t[1]||[],that.deny_cid=t[2]||[],that.deny_gid=t[3]||[],that.group_uids=[],that.nw=4,that.list_content=$("#acl-list-content"),that.item_tpl=unescape($(".acl-list-item[rel=acl-template]").html()),that.showall=$("#acl-showall"),t.length==0&&that.showall.addClass("selected"),that.showall.click(that.on_showall),$(".acl-button-show").live("click",that.on_button_show),$(".acl-button-hide").live("click",that.on_button_hide),$("#acl-search").keypress(that.on_search),$("#acl-wrapper").parents("form").submit(that.on_submit),that.get(0,100)}ACL.prototype.on_submit=function(){aclfileds=$("#acl-fields").html(""),$(that.allow_gid).each(function(e,t){aclfileds.append("<input type='hidden' name='group_allow[]' value='"+t+"'>")}),$(that.allow_cid).each(function(e,t){aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+t+"'>")}),$(that.deny_gid).each(function(e,t){aclfileds.append("<input type='hidden' name='group_deny[]' value='"+t+"'>")}),$(that.deny_cid).each(function(e,t){aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+t+"'>")})},ACL.prototype.search=function(){var e=$("#acl-search").val();that.list_content.html(""),that.get(0,100,e)},ACL.prototype.on_search=function(e){that.kp_timer&&clearTimeout(that.kp_timer),that.kp_timer=setTimeout(that.search,1e3)},ACL.prototype.on_showall=function(e){return e.preventDefault(),e.stopPropagation(),that.showall.hasClass("selected")?!1:(that.showall.addClass("selected"),that.allow_cid=[],that.allow_gid=[],that.deny_cid=[],that.deny_gid=[],that.update_view(),!1)},ACL.prototype.on_button_show=function(e){return e.preventDefault(),e.stopImmediatePropagation(),e.stopPropagation(),that.set_allow($(this).parent().attr("id")),!1},ACL.prototype.on_button_hide=function(e){return e.preventDefault(),e.stopImmediatePropagation(),e.stopPropagation(),that.set_deny($(this).parent().attr("id")),!1},ACL.prototype.set_allow=function(e){type=e[0],id=parseInt(e.substr(1));switch(type){case"g":that.allow_gid.indexOf(id)<0?that.allow_gid.push(id):that.allow_gid.remove(id),that.deny_gid.indexOf(id)>=0&&that.deny_gid.remove(id);break;case"c":that.allow_cid.indexOf(id)<0?that.allow_cid.push(id):that.allow_cid.remove(id),that.deny_cid.indexOf(id)>=0&&that.deny_cid.remove(id)}that.update_view()},ACL.prototype.set_deny=function(e){type=e[0],id=parseInt(e.substr(1));switch(type){case"g":that.deny_gid.indexOf(id)<0?that.deny_gid.push(id):that.deny_gid.remove(id),that.allow_gid.indexOf(id)>=0&&that.allow_gid.remove(id);break;case"c":that.deny_cid.indexOf(id)<0?that.deny_cid.push(id):that.deny_cid.remove(id),that.allow_cid.indexOf(id)>=0&&that.allow_cid.remove(id)}that.update_view()},ACL.prototype.update_view=function(){that.allow_gid.length==0&&that.allow_cid.length==0&&that.deny_gid.length==0&&that.deny_cid.length==0?(that.showall.addClass("selected"),$("#jot-perms-icon").removeClass("lock").addClass("unlock"),$("#jot-public").show(),$(".profile-jot-net input").attr("disabled",!1),typeof editor!="undefined"&&editor!=0&&$("#profile-jot-desc").html(ispublic)):(that.showall.removeClass("selected"),$("#jot-perms-icon").removeClass("unlock").addClass("lock"),$("#jot-public").hide(),$(".profile-jot-net input").attr("disabled","disabled"),$("#profile-jot-desc").html("&nbsp;")),$("#acl-list-content .acl-list-item").each(function(){$(this).removeClass("groupshow grouphide")}),$("#acl-list-content .acl-list-item").each(function(){itemid=$(this).attr("id"),type=itemid[0],id=parseInt(itemid.substr(1)),btshow=$(this).children(".acl-button-show").removeClass("selected"),bthide=$(this).children(".acl-button-hide").removeClass("selected");switch(type){case"g":var e="";that.allow_gid.indexOf(id)>=0&&(btshow.addClass("selected"),bthide.removeClass("selected"),e="groupshow"),that.deny_gid.indexOf(id)>=0&&(btshow.removeClass("selected"),bthide.addClass("selected"),e="grouphide"),$(that.group_uids[id]).each(function(t,n){e=="grouphide"&&$("#c"+n).removeClass("groupshow");if(e!=""){var r=$("#c"+n).attr("class");if(r==undefined)return!0;var i=r.indexOf("grouphide");i==-1&&$("#c"+n).addClass(e)}});break;case"c":that.allow_cid.indexOf(id)>=0&&(btshow.addClass("selected"),bthide.removeClass("selected")),that.deny_cid.indexOf(id)>=0&&(btshow.removeClass("selected"),bthide.addClass("selected"))}})},ACL.prototype.get=function(e,t,n){var r={start:e,count:t,search:n};$.ajax({type:"POST",url:that.url,data:r,dataType:"json",success:that.populate})},ACL.prototype.populate=function(e){var t=Math.ceil(e.tot/that.nw)*42;that.list_content.height(t),$(e.items).each(function(){html="<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>",html=html.format(this.photo,this.name,this.type,this.id,"",this.network,this.link),this.uids!=undefined&&(that.group_uids[this.id]=this.uids),that.list_content.append(html)}),that.update_view()};
\ No newline at end of file
+function ACL(backend_url,preset){that=this;that.url=backend_url;that.kp_timer=null;if(preset==undefined)preset=[];that.allow_cid=preset[0]||[];that.allow_gid=preset[1]||[];that.deny_cid=preset[2]||[];that.deny_gid=preset[3]||[];that.group_uids=[];that.nw=4;that.list_content=$("#acl-list-content");that.item_tpl=unescape($(".acl-list-item[rel=acl-template]").html());that.showall=$("#acl-showall");if(preset.length==0)that.showall.addClass("selected");that.showall.click(that.on_showall);$(".acl-button-show").live("click",that.on_button_show);$(".acl-button-hide").live("click",that.on_button_hide);$("#acl-search").keypress(that.on_search);$("#acl-wrapper").parents("form").submit(that.on_submit);that.get(0,100)}ACL.prototype.on_submit=function(){aclfileds=$("#acl-fields").html("");$(that.allow_gid).each(function(i,v){aclfileds.append("<input type='hidden' name='group_allow[]' value='"+v+"'>")});$(that.allow_cid).each(function(i,v){aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+v+"'>")});$(that.deny_gid).each(function(i,v){aclfileds.append("<input type='hidden' name='group_deny[]' value='"+v+"'>")});$(that.deny_cid).each(function(i,v){aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>")})};ACL.prototype.search=function(){var srcstr=$("#acl-search").val();that.list_content.html("");that.get(0,100,srcstr)};ACL.prototype.on_search=function(event){if(that.kp_timer)clearTimeout(that.kp_timer);that.kp_timer=setTimeout(that.search,1e3)};ACL.prototype.on_showall=function(event){event.preventDefault();event.stopPropagation();if(that.showall.hasClass("selected")){return false}that.showall.addClass("selected");that.allow_cid=[];that.allow_gid=[];that.deny_cid=[];that.deny_gid=[];that.update_view();return false};ACL.prototype.on_button_show=function(event){event.preventDefault();event.stopImmediatePropagation();event.stopPropagation();that.set_allow($(this).parent().attr("id"));return false};ACL.prototype.on_button_hide=function(event){event.preventDefault();event.stopImmediatePropagation();event.stopPropagation();that.set_deny($(this).parent().attr("id"));return false};ACL.prototype.set_allow=function(itemid){type=itemid[0];id=parseInt(itemid.substr(1));switch(type){case"g":if(that.allow_gid.indexOf(id)<0){that.allow_gid.push(id)}else{that.allow_gid.remove(id)}if(that.deny_gid.indexOf(id)>=0)that.deny_gid.remove(id);break;case"c":if(that.allow_cid.indexOf(id)<0){that.allow_cid.push(id)}else{that.allow_cid.remove(id)}if(that.deny_cid.indexOf(id)>=0)that.deny_cid.remove(id);break}that.update_view()};ACL.prototype.set_deny=function(itemid){type=itemid[0];id=parseInt(itemid.substr(1));switch(type){case"g":if(that.deny_gid.indexOf(id)<0){that.deny_gid.push(id)}else{that.deny_gid.remove(id)}if(that.allow_gid.indexOf(id)>=0)that.allow_gid.remove(id);break;case"c":if(that.deny_cid.indexOf(id)<0){that.deny_cid.push(id)}else{that.deny_cid.remove(id)}if(that.allow_cid.indexOf(id)>=0)that.allow_cid.remove(id);break}that.update_view()};ACL.prototype.update_view=function(){if(that.allow_gid.length==0&&that.allow_cid.length==0&&that.deny_gid.length==0&&that.deny_cid.length==0){that.showall.addClass("selected");$("#jot-perms-icon").removeClass("lock").addClass("unlock");$("#jot-public").show();$(".profile-jot-net input").attr("disabled",false);if(typeof editor!="undefined"&&editor!=false){$("#profile-jot-desc").html(ispublic)}}else{that.showall.removeClass("selected");$("#jot-perms-icon").removeClass("unlock").addClass("lock");$("#jot-public").hide();$(".profile-jot-net input").attr("disabled","disabled");$("#profile-jot-desc").html("&nbsp;")}$("#acl-list-content .acl-list-item").each(function(){$(this).removeClass("groupshow grouphide")});$("#acl-list-content .acl-list-item").each(function(){itemid=$(this).attr("id");type=itemid[0];id=parseInt(itemid.substr(1));btshow=$(this).children(".acl-button-show").removeClass("selected");bthide=$(this).children(".acl-button-hide").removeClass("selected");switch(type){case"g":var uclass="";if(that.allow_gid.indexOf(id)>=0){btshow.addClass("selected");bthide.removeClass("selected");uclass="groupshow"}if(that.deny_gid.indexOf(id)>=0){btshow.removeClass("selected");bthide.addClass("selected");uclass="grouphide"}$(that.group_uids[id]).each(function(i,v){if(uclass=="grouphide")$("#c"+v).removeClass("groupshow");if(uclass!=""){var cls=$("#c"+v).attr("class");if(cls==undefined)return true;var hiding=cls.indexOf("grouphide");if(hiding==-1)$("#c"+v).addClass(uclass)}});break;case"c":if(that.allow_cid.indexOf(id)>=0){btshow.addClass("selected");bthide.removeClass("selected")}if(that.deny_cid.indexOf(id)>=0){btshow.removeClass("selected");bthide.addClass("selected")}}})};ACL.prototype.get=function(start,count,search){var postdata={start:start,count:count,search:search};$.ajax({type:"POST",url:that.url,data:postdata,dataType:"json",success:that.populate})};ACL.prototype.populate=function(data){var height=Math.ceil(data.tot/that.nw)*42;that.list_content.height(height);$(data.items).each(function(){html="<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>";html=html.format(this.photo,this.name,this.type,this.id,"",this.network,this.link);if(this.uids!=undefined)that.group_uids[this.id]=this.uids;that.list_content.append(html)});$(".acl-list-item img[data-src]",that.list_content).each(function(i,el){$(el).attr("src",$(el).data("src"))});that.update_view()};
\ No newline at end of file
diff --git a/js/main.js b/js/main.js
index 5cdf2a0804..f17d1eaa0f 100644
--- a/js/main.js
+++ b/js/main.js
@@ -183,9 +183,8 @@
 				});
 
 				$("img[data-src]", nnm).each(function(i, el){
-					// Replace data-src attribute with src attribute for every image
+					// Add src attribute for images with a data-src attribute
 					$(el).attr('src', $(el).data("src"));
-					$(el).removeAttr("data-src");
 				});
 			}
 
diff --git a/mod/attach.php b/mod/attach.php
index ae6540201e..76d60a6907 100644
--- a/mod/attach.php
+++ b/mod/attach.php
@@ -34,9 +34,11 @@ function attach_init(&$a) {
 		return;
 	}
 
+	// Use quotes around the filename to prevent a "multiple Content-Disposition"
+	// error in Chrome for filenames with commas in them
 	header('Content-type: ' . $r[0]['filetype']);
-	header('Content-disposition: attachment; filename=' . $r[0]['filename']);
+	header('Content-disposition: attachment; filename="' . $r[0]['filename'] . '"');
 	echo $r[0]['data'];
 	killme();
 	// NOTREACHED
-}
\ No newline at end of file
+}
diff --git a/mod/babel.php b/mod/babel.php
index ca2c068f8e..d31e090c55 100644
--- a/mod/babel.php
+++ b/mod/babel.php
@@ -11,7 +11,7 @@ function visible_lf($s) {
 
 function babel_content(&$a) {
 
-	$o .= '<h3>Babel Diagnostic</h3>';
+	$o .= '<h1>Babel Diagnostic</h1>';
 
 	$o .= '<form action="babel" method="post">';
 	$o .= t('Source (bbcode) text:') . EOL . '<textarea name="text" >' . htmlspecialchars($_REQUEST['text']) .'</textarea>' . EOL;
@@ -28,31 +28,35 @@ function babel_content(&$a) {
 	if(x($_REQUEST,'text')) {
 
 		$text = trim($_REQUEST['text']);
-		$o .= t("Source input: ") . EOL. EOL; 
+		$o .= "<h2>" . t("Source input: ") . "</h2>" . EOL. EOL; 
 		$o .= visible_lf($text) . EOL. EOL; 
 
 		$html = bbcode($text);
-		$o .= t("bb2html: ") . EOL. EOL; 
+		$o .= "<h2>" . t("bb2html (raw HTML): ") . "</h2>" . EOL. EOL; 
+		$o .= htmlspecialchars($html). EOL. EOL; 
+
+		//$html = bbcode($text);
+		$o .= "<h2>" . t("bb2html: ") . "</h2>" . EOL. EOL; 
 		$o .= $html. EOL. EOL; 
 
 		$bbcode = html2bbcode($html);
-		$o .= t("bb2html2bb: ") . EOL. EOL; 
+		$o .= "<h2>" . t("bb2html2bb: ") . "</h2>" . EOL. EOL; 
 		$o .= visible_lf($bbcode) . EOL. EOL; 
 
 		$diaspora = bb2diaspora($text);
-		$o .= t("bb2md: ") . EOL. EOL; 
+		$o .= "<h2>" . t("bb2md: ") . "</h2>" . EOL. EOL; 
 		$o .= visible_lf($diaspora) . EOL. EOL; 
 
 		$html = Markdown($diaspora);
-		$o .= t("bb2md2html: ") . EOL. EOL; 
+		$o .= "<h2>" . t("bb2md2html: ") . "</h2>" . EOL. EOL; 
 		$o .= $html. EOL. EOL; 
 
 		$bbcode = diaspora2bb($diaspora);
-		$o .= t("bb2dia2bb: ") . EOL. EOL; 
+		$o .= "<h2>" . t("bb2dia2bb: ") . "</h2>" . EOL. EOL; 
 		$o .= visible_lf($bbcode) . EOL. EOL; 
 
 		$bbcode = html2bbcode($html);
-		$o .= t("bb2md2html2bb: ") . EOL. EOL; 
+		$o .= "<h2>" . t("bb2md2html2bb: ") . "</h2>" . EOL. EOL; 
 		$o .= visible_lf($bbcode) . EOL. EOL; 
 
 
@@ -62,12 +66,12 @@ function babel_content(&$a) {
 	if(x($_REQUEST,'d2bbtext')) {
 
 		$d2bbtext = trim($_REQUEST['d2bbtext']);
-		$o .= t("Source input (Diaspora format): ") . EOL. EOL; 
+		$o .= "<h2>" . t("Source input (Diaspora format): ") . "</h2>" . EOL. EOL; 
 		$o .= visible_lf($d2bbtext) . EOL. EOL; 
 
 
 		$bb = diaspora2bb($d2bbtext);
-		$o .= t("diaspora2bb: ") . EOL. EOL; 
+		$o .= "<h2>" . t("diaspora2bb: ") . "</h2>" . EOL. EOL; 
 		$o .= visible_lf($bb) . EOL. EOL; 
 	}
 
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index f02119807f..769036c5e0 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -746,10 +746,11 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 				'$dfrn_url' => $r[0]['url'],
 				'$uid' => $newuid )
 			);
-	
-			$res = mail($r[0]['email'], sprintf( t("Connection accepted at %s") , $a->config['sitename']),
+			require_once('include/email.php');
+
+			$res = mail($r[0]['email'], email_header_encode( sprintf( t("Connection accepted at %s") , $a->config['sitename']),'UTF-8'),
 				$email_tpl,
-				'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+				'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n"
 				. 'Content-type: text/plain; charset=UTF-8' . "\n"
 				. 'Content-transfer-encoding: 8bit' );
 
diff --git a/mod/display.php b/mod/display.php
index 32c4bcae9f..2ac1c369eb 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -1,6 +1,18 @@
 <?php
 
 
+function display_init(&$a) {
+
+	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+		return;
+	}
+
+	$nick = (($a->argc > 1) ? $a->argv[1] : '');
+	profile_load($a,$nick);
+
+}
+
+
 function display_content(&$a, $update = 0) {
 
 	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
@@ -25,10 +37,10 @@ function display_content(&$a, $update = 0) {
 	else {
 		$nick = (($a->argc > 1) ? $a->argv[1] : '');
 	}
-	profile_load($a,$nick);
 
 	if($update) {
 		$item_id = $_REQUEST['item_id'];
+		$a->profile = array('uid' => intval($update), 'profile_uid' => intval($update));
 	}
 	else {
 		$item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
@@ -108,6 +120,8 @@ function display_content(&$a, $update = 0) {
 	$sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups);
 
 	if($update) {
+
+dbg(1);
 		$r = q("SELECT id FROM item WHERE item.uid = %d
 		        AND `item`.`parent` = ( SELECT `parent` FROM `item` WHERE ( `id` = '%s' OR `uri` = '%s' ))
 		        $sql_extra AND unseen = 1",
@@ -115,6 +129,7 @@ function display_content(&$a, $update = 0) {
 		        dbesc($item_id),
 		        dbesc($item_id) 
 		);
+dbg(0);
 		if(!$r)
 			return '';
 	}
diff --git a/mod/events.php b/mod/events.php
index 61f16b50fc..2f41c0e33d 100755
--- a/mod/events.php
+++ b/mod/events.php
@@ -250,8 +250,8 @@ function events_content(&$a) {
 			$r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`,
 				`item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event` LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` 
 				WHERE `event`.`uid` = %d and event.ignore = %d
-				AND (( `adjust` = 0 AND `finish` >= '%s' AND `start` <= '%s' ) 
-				OR  (  `adjust` = 1 AND `finish` >= '%s' AND `start` <= '%s' )) ",
+				AND (( `adjust` = 0 AND ( `finish` >= '%s' or nofinish ) AND `start` <= '%s' ) 
+				OR  (  `adjust` = 1 AND ( `finish` >= '%s' or nofinish ) AND `start` <= '%s' )) ",
 				intval(local_user()),
 				intval($ignored),
 				dbesc($start),
diff --git a/mod/group.php b/mod/group.php
index 13a899ed96..cef4371e94 100644
--- a/mod/group.php
+++ b/mod/group.php
@@ -220,16 +220,15 @@ function group_content(&$a) {
 		}
 	}
 
+	$context['$groupeditor'] = $groupeditor;
 	$context['$desc'] = t('Click on a contact to add or remove.');
 
 	if($change) {
-		$context['$groupeditor'] = $groupeditor;
 		$tpl = get_markup_template('groupeditor.tpl');
 		echo replace_macros($tpl, $context);
 		killme();
 	}
 	
-	$context['$groupedit_info'] = $groupeditor;
 	return replace_macros($tpl, $context);
 
 }
diff --git a/mod/home.php b/mod/home.php
index 76318b157c..f703263a2c 100644
--- a/mod/home.php
+++ b/mod/home.php
@@ -25,8 +25,12 @@ function home_content(&$a) {
 	if(x($_SESSION,'mobile-theme'))
 		unset($_SESSION['mobile-theme']);
 
-	if(file_exists('home.html'))
- 		$o .= file_get_contents('home.html');
+	if(file_exists('home.html')){
+		if(file_exists('home.css')){
+			  $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/home.css' . '" media="all" />';}
+					  
+ 		$o .= file_get_contents('home.html');}
+ 		
 	else 	$o .= '<h1>' . ((x($a->config,'sitename')) ? sprintf( t("Welcome to %s") ,$a->config['sitename']) : "" ) . '</h1>';
 
 
diff --git a/mod/invite.php b/mod/invite.php
index 2dbf93c590..384161c6d3 100644
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -7,6 +7,8 @@
  *
  */
 
+require_once('include/email.php');
+
 function invite_post(&$a) {
 
 	if(! local_user()) {
@@ -56,7 +58,7 @@ function invite_post(&$a) {
 		else
 			$nmessage = $message;
 
-		$res = mail($recip, sprintf( t('Please join us on Friendica'), $a->config['sitename']), 
+		$res = mail($recip, email_header_encode( t('Please join us on Friendica'),'UTF-8'), 
 			$nmessage, 
 			"From: " . $a->user['email'] . "\n"
 			. 'Content-type: text/plain; charset=UTF-8' . "\n"
diff --git a/mod/item.php b/mod/item.php
index 7096239b0f..452ec8a36d 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -757,6 +757,15 @@ function item_post(&$a) {
 		// update filetags in pconfig
                 file_tag_update_pconfig($uid,$categories_old,$categories_new,'category');
 
+		// Store the fresh generated item into the cache
+		$cachefile = get_cachefile($datarray["guid"]."-".hash("md5", $datarray['body']));
+
+		if (($cachefile != '') AND !file_exists($cachefile)) {
+			$s = prepare_text($datarray['body']);
+			file_put_contents($cachefile, $s);
+			logger('mod_item: put item '.$r[0]['id'].' into cachefile '.$cachefile);
+		}
+
 		if($parent) {
 
 			// This item is the last leaf and gets the comment box, clear any ancestors
diff --git a/mod/lostpass.php b/mod/lostpass.php
index 57e6d69653..cc31efd973 100644
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -1,5 +1,6 @@
 <?php
 
+require_once('include/email.php');
 
 function lostpass_post(&$a) {
 
@@ -40,9 +41,9 @@ function lostpass_post(&$a) {
 			'$reset_link' => $a->get_baseurl() . '/lostpass?verify=' . $new_password
 	));
 
-	$res = mail($email, sprintf( t('Password reset requested at %s'),$a->config['sitename']),
+	$res = mail($email, email_header_encode(sprintf( t('Password reset requested at %s'),$a->config['sitename']),'UTF-8'),
 			$email_tpl,
-			'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+			'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n"
 			. 'Content-type: text/plain; charset=UTF-8' . "\n"
 			. 'Content-transfer-encoding: 8bit' );
 
@@ -103,8 +104,10 @@ function lostpass_content(&$a) {
 			'$new_password' => $new_password,
 			'$uid' => $newuid ));
 
-			$res = mail($email,"Your password has changed at {$a->config['sitename']}",$email_tpl,
-				'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+			$subject = sprintf( t('Your password has been changed at %s'), $a->config['sitename']);
+
+			$res = mail($email, email_header_encode( $subject, 'UTF-8'), $email_tpl,
+				'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n"
 				. 'Content-type: text/plain; charset=UTF-8' . "\n"
 				. 'Content-transfer-encoding: 8bit' );
 
diff --git a/mod/maintenance.php b/mod/maintenance.php
new file mode 100644
index 0000000000..b50c94c9b9
--- /dev/null
+++ b/mod/maintenance.php
@@ -0,0 +1,7 @@
+<?php
+
+function maintenance_content(&$a) {
+	return replace_macros(get_markup_template('maintenance.tpl'), array(
+		'$sysdown' => t('System down for maintenance')
+	));
+}
diff --git a/mod/message.php b/mod/message.php
index 057797ddda..885cdcd629 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -516,7 +516,7 @@ function message_content(&$a) {
 			'$to' => t('To:'),
 			'$showinputs' => '',
 			'$subject' => t('Subject:'),
-			'$subjtxt' => template_escape($message['title']),
+			'$subjtxt' => $subjtxt_e,
 			'$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
 			'$yourmessage' => t('Your message:'),
 			'$text' => '',
diff --git a/mod/parse_url.php b/mod/parse_url.php
index 400c248e05..a2b4c9e28a 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -236,8 +236,6 @@ function parse_url_content(&$a) {
 	$str_tags = '';
 
 	$textmode = false;
-	if(local_user() && intval(get_pconfig(local_user(),'system','plaintext')))
-		$textmode = true;
 
 	if(local_user() && (! feature_enabled(local_user(),'richtext')))
 		$textmode = true;
diff --git a/mod/profile.php b/mod/profile.php
index 9e9af19834..25871c2405 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -33,7 +33,6 @@ function profile_init(&$a) {
 		auto_redir($a, $which);
 	}
 
-	set_template_engine($a); // reset the template engine to the default in case the user's theme doesn't specify one
 	profile_load($a,$which,$profile);
 
 	$blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
diff --git a/mod/profiles.php b/mod/profiles.php
index eaa603a282..f517478a1a 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -1,6 +1,145 @@
 <?php
 
 
+function profiles_init(&$a) {
+
+	nav_set_selected('profiles');
+
+	if(! local_user()) {
+		return;
+	}
+
+	if(($a->argc > 2) && ($a->argv[1] === "drop") && intval($a->argv[2])) {
+		$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d AND `is-default` = 0 LIMIT 1",
+			intval($a->argv[2]),
+			intval(local_user())
+		);
+		if(! count($r)) {
+			notice( t('Profile not found.') . EOL);
+			goaway($a->get_baseurl(true) . '/profiles');
+			return; // NOTREACHED
+		}
+		
+		check_form_security_token_redirectOnErr('/profiles', 'profile_drop', 't');
+
+		// move every contact using this profile as their default to the user default
+
+		$r = q("UPDATE `contact` SET `profile-id` = (SELECT `profile`.`id` AS `profile-id` FROM `profile` WHERE `profile`.`is-default` = 1 AND `profile`.`uid` = %d LIMIT 1) WHERE `profile-id` = %d AND `uid` = %d ",
+			intval(local_user()),
+			intval($a->argv[2]),
+			intval(local_user())
+		);
+		$r = q("DELETE FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+			intval($a->argv[2]),
+			intval(local_user())
+		);
+		if($r)
+			info( t('Profile deleted.') . EOL);
+
+		goaway($a->get_baseurl(true) . '/profiles');
+		return; // NOTREACHED
+	}
+
+
+
+
+
+	if(($a->argc > 1) && ($a->argv[1] === 'new')) {
+		
+		check_form_security_token_redirectOnErr('/profiles', 'profile_new', 't');
+
+		$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
+			intval(local_user()));
+		$num_profiles = count($r0);
+
+		$name = t('Profile-') . ($num_profiles + 1);
+
+		$r1 = q("SELECT `name`, `photo`, `thumb` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
+			intval(local_user()));
+		
+		$r2 = q("INSERT INTO `profile` (`uid` , `profile-name` , `name`, `photo`, `thumb`)
+			VALUES ( %d, '%s', '%s', '%s', '%s' )",
+			intval(local_user()),
+			dbesc($name),
+			dbesc($r1[0]['name']),
+			dbesc($r1[0]['photo']),
+			dbesc($r1[0]['thumb'])
+		);
+
+		$r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile-name` = '%s' LIMIT 1",
+			intval(local_user()),
+			dbesc($name)
+		);
+
+		info( t('New profile created.') . EOL);
+		if(count($r3) == 1)
+			goaway($a->get_baseurl(true) . '/profiles/' . $r3[0]['id']);
+		
+		goaway($a->get_baseurl(true) . '/profiles');
+	} 
+
+	if(($a->argc > 2) && ($a->argv[1] === 'clone')) {
+		
+		check_form_security_token_redirectOnErr('/profiles', 'profile_clone', 't');
+
+		$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
+			intval(local_user()));
+		$num_profiles = count($r0);
+
+		$name = t('Profile-') . ($num_profiles + 1);
+		$r1 = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d LIMIT 1",
+			intval(local_user()),
+			intval($a->argv[2])
+		);
+		if(! count($r1)) {
+			notice( t('Profile unavailable to clone.') . EOL);
+			killme();
+			return;
+		}
+		unset($r1[0]['id']);
+		$r1[0]['is-default'] = 0;
+		$r1[0]['publish'] = 0;	
+		$r1[0]['net-publish'] = 0;	
+		$r1[0]['profile-name'] = dbesc($name);
+
+		dbesc_array($r1[0]);
+
+		$r2 = dbq("INSERT INTO `profile` (`" 
+			. implode("`, `", array_keys($r1[0])) 
+			. "`) VALUES ('" 
+			. implode("', '", array_values($r1[0])) 
+			. "')" );
+
+		$r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile-name` = '%s' LIMIT 1",
+			intval(local_user()),
+			dbesc($name)
+		);
+		info( t('New profile created.') . EOL);
+		if(count($r3) == 1)
+			goaway($a->get_baseurl(true) . '/profiles/' . $r3[0]['id']);
+		
+		goaway($a->get_baseurl(true) . '/profiles');
+		
+		return; // NOTREACHED
+	}
+
+
+	if(($a->argc > 1) && (intval($a->argv[1]))) {
+		$r = q("SELECT id FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+			intval($a->argv[1]),
+			intval(local_user())
+		);
+		if(! count($r)) {
+			notice( t('Profile not found.') . EOL);
+			killme();
+			return;
+		}
+
+		profile_load($a,$a->user['nickname'],$r[0]['id']);
+	}
+
+}
+
 function profiles_post(&$a) {
 
 	if(! local_user()) {
@@ -424,127 +563,12 @@ function profile_activity($changed, $value) {
 
 function profiles_content(&$a) {
 
-	$o = '';
-	nav_set_selected('profiles');
-
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
 
-	if(($a->argc > 2) && ($a->argv[1] === "drop") && intval($a->argv[2])) {
-		$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d AND `is-default` = 0 LIMIT 1",
-			intval($a->argv[2]),
-			intval(local_user())
-		);
-		if(! count($r)) {
-			notice( t('Profile not found.') . EOL);
-			goaway($a->get_baseurl(true) . '/profiles');
-			return; // NOTREACHED
-		}
-		
-		check_form_security_token_redirectOnErr('/profiles', 'profile_drop', 't');
-
-		// move every contact using this profile as their default to the user default
-
-		$r = q("UPDATE `contact` SET `profile-id` = (SELECT `profile`.`id` AS `profile-id` FROM `profile` WHERE `profile`.`is-default` = 1 AND `profile`.`uid` = %d LIMIT 1) WHERE `profile-id` = %d AND `uid` = %d ",
-			intval(local_user()),
-			intval($a->argv[2]),
-			intval(local_user())
-		);
-		$r = q("DELETE FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-			intval($a->argv[2]),
-			intval(local_user())
-		);
-		if($r)
-			info( t('Profile deleted.') . EOL);
-
-		goaway($a->get_baseurl(true) . '/profiles');
-		return; // NOTREACHED
-	}
-
-
-
-
-
-	if(($a->argc > 1) && ($a->argv[1] === 'new')) {
-		
-		check_form_security_token_redirectOnErr('/profiles', 'profile_new', 't');
-
-		$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
-			intval(local_user()));
-		$num_profiles = count($r0);
-
-		$name = t('Profile-') . ($num_profiles + 1);
-
-		$r1 = q("SELECT `name`, `photo`, `thumb` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
-			intval(local_user()));
-		
-		$r2 = q("INSERT INTO `profile` (`uid` , `profile-name` , `name`, `photo`, `thumb`)
-			VALUES ( %d, '%s', '%s', '%s', '%s' )",
-			intval(local_user()),
-			dbesc($name),
-			dbesc($r1[0]['name']),
-			dbesc($r1[0]['photo']),
-			dbesc($r1[0]['thumb'])
-		);
-
-		$r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile-name` = '%s' LIMIT 1",
-			intval(local_user()),
-			dbesc($name)
-		);
-
-		info( t('New profile created.') . EOL);
-		if(count($r3) == 1)
-			goaway($a->get_baseurl(true) . '/profiles/' . $r3[0]['id']);
-		
-		goaway($a->get_baseurl(true) . '/profiles');
-	} 
-
-	if(($a->argc > 2) && ($a->argv[1] === 'clone')) {
-		
-		check_form_security_token_redirectOnErr('/profiles', 'profile_clone', 't');
-
-		$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
-			intval(local_user()));
-		$num_profiles = count($r0);
-
-		$name = t('Profile-') . ($num_profiles + 1);
-		$r1 = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d LIMIT 1",
-			intval(local_user()),
-			intval($a->argv[2])
-		);
-		if(! count($r1)) {
-			notice( t('Profile unavailable to clone.') . EOL);
-			return;
-		}
-		unset($r1[0]['id']);
-		$r1[0]['is-default'] = 0;
-		$r1[0]['publish'] = 0;	
-		$r1[0]['net-publish'] = 0;	
-		$r1[0]['profile-name'] = dbesc($name);
-
-		dbesc_array($r1[0]);
-
-		$r2 = dbq("INSERT INTO `profile` (`" 
-			. implode("`, `", array_keys($r1[0])) 
-			. "`) VALUES ('" 
-			. implode("', '", array_values($r1[0])) 
-			. "')" );
-
-		$r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile-name` = '%s' LIMIT 1",
-			intval(local_user()),
-			dbesc($name)
-		);
-		info( t('New profile created.') . EOL);
-		if(count($r3) == 1)
-			goaway($a->get_baseurl(true) . '/profiles/' . $r3[0]['id']);
-		
-		goaway($a->get_baseurl(true) . '/profiles');
-		
-		return; // NOTREACHED
-	}
-
+	$o = '';
 
 	if(($a->argc > 1) && (intval($a->argv[1]))) {
 		$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
@@ -556,8 +580,6 @@ function profiles_content(&$a) {
 			return;
 		}
 
-		profile_load($a,$a->user['nickname'],$r[0]['id']);
-
 		require_once('include/profile_selectors.php');
 
 
diff --git a/mod/register.php b/mod/register.php
index 208f97bcb6..3532f92e8d 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once('include/email.php');
+
 if(! function_exists('register_post')) {
 function register_post(&$a) {
 
@@ -86,9 +88,9 @@ function register_post(&$a) {
 				'$password' => $result['password'],
 				'$uid' => $user['uid'] ));
 
-		$res = mail($user['email'], sprintf(t('Registration details for %s'), $a->config['sitename']),
+		$res = mail($user['email'], email_header_encode( sprintf( t('Registration details for %s'), $a->config['sitename']),'UTF-8'),
 			$email_tpl, 
-				'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+				'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n"
 				. 'Content-type: text/plain; charset=UTF-8' . "\n"
 				. 'Content-transfer-encoding: 8bit' );
 
@@ -140,9 +142,9 @@ function register_post(&$a) {
 				'$hash' => $hash
 		 ));
 
-		$res = mail($a->config['admin_email'], sprintf(t('Registration request at %s'), $a->config['sitename']),
+		$res = mail($a->config['admin_email'], email_header_encode( sprintf(t('Registration request at %s'), $a->config['sitename']),'UTF-8'),
 			$email_tpl,
-				'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+				'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n"
 				. 'Content-type: text/plain; charset=UTF-8' . "\n"
 				. 'Content-transfer-encoding: 8bit' );
 
@@ -239,7 +241,6 @@ function register_content(&$a) {
 		));
 	}
 
-
 	$license = '';
 
 	$o = get_markup_template("register.tpl");
@@ -267,7 +268,7 @@ function register_content(&$a) {
 		'$openid'    => $openid_url,
 		'$namelabel' => t('Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '),
 		'$addrlabel' => t('Your Email Address: '),
-		'$nickdesc'  => t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'<strong>nickname@$sitename</strong>\'.'),
+		'$nickdesc'  => str_replace('$sitename',$a->get_hostname(),t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'<strong>nickname@$sitename</strong>\'.')),
 		'$nicklabel' => t('Choose a nickname: '),
 		'$photo'     => $photo,
 		'$publish'   => $profile_publish,
diff --git a/mod/regmod.php b/mod/regmod.php
index 21f41eb01c..5ed7642005 100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once('include/email.php');
+
 function user_allow($hash) {
 
 	$a = get_app();
@@ -49,9 +51,9 @@ function user_allow($hash) {
 			'$uid' => $user[0]['uid']
 	));
 
-	$res = mail($user[0]['email'], sprintf(t('Registration details for %s'), $a->config['sitename']),
+	$res = mail($user[0]['email'], email_header_encode( sprintf(t('Registration details for %s'), $a->config['sitename']), 'UTF-8'),
 		$email_tpl,
-			'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+			'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n"
 			. 'Content-type: text/plain; charset=UTF-8' . "\n"
 			. 'Content-transfer-encoding: 8bit' );
 
diff --git a/mod/share.php b/mod/share.php
index 516ff98e73..8358f67169 100644
--- a/mod/share.php
+++ b/mod/share.php
@@ -26,7 +26,8 @@ function share_init(&$a) {
 			$o = "[share author='".str_replace("'", "&#039;",$r[0]['author-name']).
 				"' profile='".$r[0]['author-link'].
 				"' avatar='".$r[0]['author-avatar'].
-				"' link='".$r[0]['plink']."']\n";
+				"' link='".$r[0]['plink'].
+				"' posted='".$r[0]['created']."']\n";
 			if($r[0]['title'])
 				$o .= '[b]'.$r[0]['title'].'[/b]'."\n";
 			$o .= $r[0]['body'];
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index d35b703aa8..3bd3d8dc26 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -160,7 +160,12 @@ function wall_upload_post(&$a) {
 
 //if we get the signal then return the image url info in BBCODE, otherwise this outputs the info and bails (for the ajax image uploader on wall post)
 	if ($_REQUEST['hush']!='yeah') {
-		echo  "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]\n\n";
+		if(local_user() && (! feature_enabled(local_user(),'richtext') || x($_REQUEST['nomce'])) ) {
+			echo  "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]\n\n";
+		}
+		else {
+			echo  '<br /><br /><a href="' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '" ><img src="' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."\" alt=\"$basename\" /></a><br /><br />";
+		}
 	}
 	else {
 		$m = '[url=' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]";
diff --git a/mods/friendica-to-smarty-tpl.py b/mods/friendica-to-smarty-tpl.py
index 6037d04ea2..8149051cae 100755
--- a/mods/friendica-to-smarty-tpl.py
+++ b/mods/friendica-to-smarty-tpl.py
@@ -1,14 +1,17 @@
 #!/usr/bin/python
 #
 # Script to convert Friendica internal template files into Smarty template files
-# Copyright 2012 Zach Prezkuta
+# Copyright 2013 Zach Prezkuta
 # Licensed under GPL v3
 
 import os, re, string
+import sys, getopt
 
 ldelim = '{{'
 rdelim = '}}'
 
+addheader = True
+
 def fToSmarty(matches):
 	match = matches.group(0)
 	if match == '$j':
@@ -77,7 +80,7 @@ def fix_element(element):
 
 		if parts[first+1][0] == '$':
 			# This takes care of elements where the filename is a variable, e.g. {{ inc $file }}
-			element += 'file:' + ldelim + parts[first+1].rstrip('}') + rdelim
+			element += ldelim + parts[first+1].rstrip('}') + rdelim
 		else:
 			# This takes care of elements where the filename is a path, e.g. {{ inc file.tpl }}
 			element += parts[first+1].rstrip('}') 
@@ -93,6 +96,10 @@ def fix_element(element):
 
 
 def convert(filename, tofilename, php_tpl):
+	if addheader:
+		header = ldelim + "*\n *\tAUTOMATICALLY GENERATED TEMPLATE\n *\tDO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN\n *\n *" + rdelim + "\n"
+		tofilename.write(header)
+
 	for line in filename:
 		newline = ''
 		st_pos = 0
@@ -170,7 +177,39 @@ def convert(filename, tofilename, php_tpl):
 		tofilename.write(newline)
 
 
-path = raw_input('Path to template folder to convert: ')
+def help(pname):
+	print "\nUsage:"
+	print "\t" + pname + " -h\n\n\t\t\tShow this help screen\n"
+	print "\t" + pname + " -p directory\n\n\t\t\tConvert all .tpl files in directory to\n\t\t\tSmarty templates in directory/smarty3/\n"
+	print "\t" + pname + "\n\n\t\t\tInteractive mode\n"
+
+
+
+
+#
+# Main script
+#
+
+path = ''
+
+try:
+	opts, args = getopt.getopt(sys.argv[1:], "hp:", ['no-header'])
+	for opt, arg in opts:
+		if opt == '-h':
+			help(sys.argv[0])
+			sys.exit()
+		elif opt == '-p':
+			path = arg
+		elif opt == '--no-header':
+			addheader = False
+except getopt.GetoptError:
+	help(sys.argv[0])
+	sys.exit(2)
+	
+
+if path == '':
+	path = raw_input('Path to template folder to convert: ')
+
 if path[-1:] != '/':
 	path = path + '/'
 
@@ -189,10 +228,14 @@ for a_file in files:
 	filename = os.path.join(path,a_file)
 	ext = a_file.split('.')[-1]
 	if os.path.isfile(filename) and ext == 'tpl':
-		with open(filename, 'r') as f:
-			newfilename = os.path.join(outpath,a_file)
-			with open(newfilename, 'w') as outf:
-				print "Converting " + filename + " to " + newfilename
-				convert(f, outf, php_tpl)
+		f = open(filename, 'r')
 
+		newfilename = os.path.join(outpath,a_file)
+		outf = open(newfilename, 'w')
+
+		print "Converting " + filename + " to " + newfilename
+		convert(f, outf, php_tpl)
+
+		outf.close()
+		f.close()
 
diff --git a/mods/sample-nginx.config b/mods/sample-nginx.config
index 0fb31efffc..b99fafa80c 100644
--- a/mods/sample-nginx.config
+++ b/mods/sample-nginx.config
@@ -79,7 +79,7 @@ server {
   # otherwise fall back to front controller
   # allow browser to cache them
   # added .htm for advanced source code editor library
-  location ~* \.(jpg|jpeg|gif|png|css|js|htm|html)$ {
+  location ~* \.(jpg|jpeg|gif|png|ico|css|js|htm|html|ttf|svg)$ {
     expires 30d;
     try_files $uri /index.php?q=$uri&$args;
   }
diff --git a/mods/updatetpl.py b/mods/updatetpl.py
new file mode 100755
index 0000000000..aa815910c2
--- /dev/null
+++ b/mods/updatetpl.py
@@ -0,0 +1,64 @@
+#!/usr/bin/python
+#
+# Script to update Smarty template files from all internal templates
+# Copyright 2013 Zach Prezkuta
+# Licensed under GPL v3
+
+
+import os
+import sys, getopt
+import subprocess
+
+
+def help(pname):
+	print "\nUsage:"
+	print "\t" + pname + " -h\n\n\t\t\tShow this help screen\n"
+	print "\t" + pname + " -p directory\n\n\t\t\tConvert all .tpl files in top-level\n\t\t\tFriendica directory to Smarty templates\n"
+	print "\t" + pname + "\n\n\t\t\tInteractive mode\n"
+
+
+
+#
+# Main script
+#
+
+path = ''
+
+try:
+	opts, args = getopt.getopt(sys.argv[1:], "hp:")
+	for opt, arg in opts:
+		if opt == '-h':
+			help(sys.argv[0])
+			sys.exit()
+		elif opt == '-p':
+			path = arg
+except getopt.GetoptError:
+	help(sys.argv[0])
+	sys.exit(2)
+
+if path == '':
+	path = raw_input('Path to top-level Friendica directory: ')
+
+if path[-1:] != '/':
+	path = path + '/'
+
+tplpaths = ['view/']
+names = os.listdir(path + 'view/')
+for name in names:
+	if os.path.isdir(path + 'view/' + name):
+		if name != 'smarty3' and name != 'theme':
+			tplpaths.append('view/' + name + '/')
+
+names = os.listdir(path + 'view/theme/')
+for name in names:
+	if os.path.isdir(path + 'view/theme/' + name):
+		tplpaths.append('view/theme/' + name + '/')
+
+fnull = open(os.devnull, "w")
+
+for tplpath in tplpaths:
+	print "Converting " + path + tplpath
+	subprocess.call(['python', path + 'mods/friendica-to-smarty-tpl.py', '-p', path + tplpath], stdout = fnull)
+
+fnull.close()
+
diff --git a/object/Item.php b/object/Item.php
index 648b558071..18281e9bcb 100644
--- a/object/Item.php
+++ b/object/Item.php
@@ -66,6 +66,7 @@ class Item extends BaseObject {
 				if(! visible_activity($item)) {
 					continue;
 				}
+				$item['pagedrop'] = $data['pagedrop'];
 				$child = new Item($item);
 				$this->add_child($child);
 			}
@@ -150,7 +151,7 @@ class Item extends BaseObject {
 		$hashtags = array();
 		$mentions = array();
 
-		$taglist = q("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d)",
+		$taglist = q("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d) ORDER BY `tid`",
 				intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION));
 
 		foreach($taglist as $tag) {
@@ -536,13 +537,7 @@ class Item extends BaseObject {
 			return false;
 		}
 
-		if($a->theme['template_engine'] === 'smarty3') {
-			$template_file = get_template_file($a, 'smarty3/' . $this->available_templates[$name]);
-		}
-		else {
-			$template_file = $this->available_templates[$name];
-		}
-		$this->template = $template_file;
+		$this->template = $this->available_templates[$name];
 	}
 
 	/**
diff --git a/update.php b/update.php
index 4bee3a3bc1..2ab2f300c0 100644
--- a/update.php
+++ b/update.php
@@ -1371,6 +1371,7 @@ ADD INDEX ( `datasize` ) ");
 }
 
 function update_1157() {
+<<<<<<< HEAD
 	$r = q("ALTER TABLE `term` ADD `aid` int(10) unsigned NOT NULL DEFAULT '0',
 		ADD `uid` int(10) unsigned NOT NULL DEFAULT '0',
 		ADD INDEX (`uid`),
@@ -1380,6 +1381,32 @@ function update_1157() {
 	return UPDATE_SUCCESS;
 }
 function update_1158() {
+	$r = q("CREATE TABLE  IF NOT EXISTS `dsprphotoq` (
+	  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+	  `uid` int(11) NOT NULL,
+	  `msg` mediumtext NOT NULL,
+	  `attempt` tinyint(4) NOT NULL,
+	  PRIMARY KEY (`id`)
+	  ) ENGINE=MyISAM DEFAULT CHARSET=utf8"
+	);
+
+	if($r)
+		return UPDATE_SUCCESS;
+
+	return UPDATE_FAILED;
+}
+
+function update_1159() {
+	$r = q("ALTER TABLE `term` ADD `aid` int(10) unsigned NOT NULL DEFAULT '0',
+		ADD `uid` int(10) unsigned NOT NULL DEFAULT '0',
+		ADD INDEX (`uid`),
+		ADD INDEX (`aid`)");
+
+	if(!$r) return UPDATE_FAILED;
+	return UPDATE_SUCCESS;
+}
+
+function update_1160() {
 	$r = q("ALTER TABLE `item` ADD `mention` TINYINT(1) NOT NULL DEFAULT '0', ADD INDEX (`mention`)");
 // KEY `mention` (`mention`)
 	if(!$r) return UPDATE_FAILED;
diff --git a/util/config b/util/config
new file mode 100644
index 0000000000..67fe14f934
--- /dev/null
+++ b/util/config
@@ -0,0 +1,34 @@
+#!/usr/bin/env php
+<?php
+
+// Red config utility
+
+require_once('include/cli_startup.php');
+
+cli_startup();
+
+if($argc > 3) {
+	set_config($argv[1],$argv[2],$argv[3]);
+	echo "config[{$argv[1]}][{$argv[2]}] = " . get_config($argv[1],$argv[2]) . "\n";
+}
+
+if($argc == 3) {
+	echo "config[{$argv[1]}][{$argv[2]}] = " . get_config($argv[1],$argv[2]) . "\n";
+}
+
+if($argc == 2) {
+	load_config($argv[1]);
+	foreach($a->config[$argv[1]] as $k => $x) {
+		echo "config[{$argv[1]}][{$k}] = " . $x . "\n";
+	}
+}
+
+if($argc == 1) {
+	$r = q("select * from config where 1");
+	if($r) {
+		foreach($r as $rr) {
+			echo "config[{$rr['cat']}][{$rr['k']}] = " . $rr['v'] . "\n";
+		}
+	}
+}
+
diff --git a/util/config.md b/util/config.md
new file mode 100644
index 0000000000..3b834fe01a
--- /dev/null
+++ b/util/config.md
@@ -0,0 +1,26 @@
+CLI config utility
+==================
+
+Usage:
+
+
+config
+	displays all config entries
+
+
+config family
+	displays all config entries for family (system, database, etc)
+
+
+config family key
+	displays single config entry for specified family and key
+
+config family key value
+	set config entry for specified family and key to value and display result
+
+
+
+Notes:
+	Setting config entries which are manually set in .htconfig.php may result in 
+conflict between database settings and the manual startup settings. 
+
diff --git a/util/maintenance.php b/util/maintenance.php
new file mode 100644
index 0000000000..d1ff94524e
--- /dev/null
+++ b/util/maintenance.php
@@ -0,0 +1,31 @@
+<?php
+
+require_once("boot.php");
+
+$a = new App;
+@include(".htconfig.php");
+
+$lang = get_browser_language();
+load_translation_table($lang);
+
+require_once("include/dba.php");
+$db = new dba($db_host, $db_user, $db_pass, $db_data, false);
+        unset($db_host, $db_user, $db_pass, $db_data);
+load_config('config');
+load_config('system');
+
+$maint_mode = 1;
+if($argc > 1)
+	$maint_mode = intval($argv[1]);
+set_config('system', 'maintenance', $maint_mode);
+
+if($maint_mode)
+	$mode_str = "maintenance mode";
+else
+	$mode_str = "normal mode";
+
+echo "\n\tSystem set in $mode_str\n\n";
+echo "Usage:\n\n";
+echo "\tphp {$argv[0]} [1]\tSet the system in maintenance mode\n";
+echo "\tphp {$argv[0]} 0  \tSet the system in normal mode\n\n";
+
diff --git a/util/messages.po b/util/messages.po
index a66a51973c..2b2159f99b 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.1.1572\n"
+"Project-Id-Version: 3.1.1589\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-29 10:00-0800\n"
+"POT-Creation-Date: 2013-01-15 10:00-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -46,22 +46,22 @@ msgstr ""
 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
 #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22
-#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:139
+#: ../../mod/register.php:40 ../../mod/regmod.php:118 ../../mod/item.php:139
 #: ../../mod/item.php:155 ../../mod/mood.php:114
 #: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169
 #: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193
 #: ../../mod/message.php:38 ../../mod/message.php:172
 #: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25
 #: ../../mod/wall_upload.php:66 ../../mod/follow.php:9
-#: ../../mod/display.php:165 ../../mod/profiles.php:7
-#: ../../mod/profiles.php:431 ../../mod/delegate.php:6
-#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
-#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510
-#: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:166
-#: ../../addon/fbpost/fbpost.php:172
+#: ../../mod/display.php:180 ../../mod/profiles.php:146
+#: ../../mod/profiles.php:567 ../../mod/delegate.php:6
+#: ../../mod/suggest.php:28 ../../mod/invite.php:15 ../../mod/invite.php:83
+#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:512
+#: ../../addon/facebook/facebook.php:518 ../../addon/fbpost/fbpost.php:170
+#: ../../addon/fbpost/fbpost.php:176
 #: ../../addon/dav/friendica/layout.fnk.php:354
 #: ../../addon/tumblr/tumblr.php:34 ../../include/items.php:3987
-#: ../../index.php:333 ../../addon.old/facebook/facebook.php:510
+#: ../../index.php:340 ../../addon.old/facebook/facebook.php:510
 #: ../../addon.old/facebook/facebook.php:516
 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165
 #: ../../addon.old/dav/friendica/layout.fnk.php:354
@@ -142,11 +142,11 @@ msgstr ""
 #: ../../mod/settings.php:1018 ../../mod/group.php:87 ../../mod/mood.php:137
 #: ../../mod/message.php:301 ../../mod/message.php:527 ../../mod/admin.php:461
 #: ../../mod/admin.php:728 ../../mod/admin.php:865 ../../mod/admin.php:1064
-#: ../../mod/admin.php:1151 ../../mod/profiles.php:604
-#: ../../mod/invite.php:119 ../../addon/fromgplus/fromgplus.php:44
-#: ../../addon/facebook/facebook.php:619
+#: ../../mod/admin.php:1151 ../../mod/profiles.php:626
+#: ../../mod/invite.php:121 ../../addon/fromgplus/fromgplus.php:44
+#: ../../addon/facebook/facebook.php:621
 #: ../../addon/snautofollow/snautofollow.php:64
-#: ../../addon/fbpost/fbpost.php:272 ../../addon/yourls/yourls.php:76
+#: ../../addon/fbpost/fbpost.php:280 ../../addon/yourls/yourls.php:76
 #: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:88
 #: ../../addon/page/page.php:211 ../../addon/planets/planets.php:158
 #: ../../addon/uhremotestorage/uhremotestorage.php:89
@@ -159,7 +159,7 @@ msgstr ""
 #: ../../addon/impressum/impressum.php:83
 #: ../../addon/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57
 #: ../../addon/qcomment/qcomment.php:61
-#: ../../addon/openstreetmap/openstreetmap.php:70
+#: ../../addon/openstreetmap/openstreetmap.php:94
 #: ../../addon/group_text/group_text.php:84
 #: ../../addon/libravatar/libravatar.php:99
 #: ../../addon/libertree/libertree.php:90 ../../addon/altpager/altpager.php:91
@@ -168,23 +168,23 @@ msgstr ""
 #: ../../addon/gravatar/gravatar.php:95
 #: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93
 #: ../../addon/jappixmini/jappixmini.php:307
-#: ../../addon/statusnet/statusnet.php:278
-#: ../../addon/statusnet/statusnet.php:292
-#: ../../addon/statusnet/statusnet.php:318
-#: ../../addon/statusnet/statusnet.php:325
-#: ../../addon/statusnet/statusnet.php:353
-#: ../../addon/statusnet/statusnet.php:703 ../../addon/tumblr/tumblr.php:233
+#: ../../addon/statusnet/statusnet.php:290
+#: ../../addon/statusnet/statusnet.php:304
+#: ../../addon/statusnet/statusnet.php:330
+#: ../../addon/statusnet/statusnet.php:337
+#: ../../addon/statusnet/statusnet.php:374
+#: ../../addon/statusnet/statusnet.php:752 ../../addon/tumblr/tumblr.php:233
 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88
 #: ../../addon/wppost/wppost.php:110 ../../addon/showmore/showmore.php:48
-#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180
-#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:515
+#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:191
+#: ../../addon/twitter/twitter.php:229 ../../addon/twitter/twitter.php:554
 #: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77
 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103
 #: ../../view/theme/cleanzero/config.php:80
-#: ../../view/theme/diabook/theme.php:643
+#: ../../view/theme/diabook/theme.php:642
 #: ../../view/theme/diabook/config.php:152
 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70
-#: ../../object/Item.php:603 ../../addon.old/fromgplus/fromgplus.php:40
+#: ../../object/Item.php:604 ../../addon.old/fromgplus/fromgplus.php:40
 #: ../../addon.old/facebook/facebook.php:619
 #: ../../addon.old/snautofollow/snautofollow.php:64
 #: ../../addon.old/bg/bg.php:90 ../../addon.old/fbpost/fbpost.php:226
@@ -242,11 +242,11 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
-#: ../../mod/help.php:90 ../../index.php:218
+#: ../../mod/help.php:90 ../../index.php:225
 msgid "Not Found"
 msgstr ""
 
-#: ../../mod/help.php:93 ../../index.php:221
+#: ../../mod/help.php:93 ../../index.php:228
 msgid "Page not found."
 msgstr ""
 
@@ -288,8 +288,8 @@ msgstr ""
 msgid "link to source"
 msgstr ""
 
-#: ../../mod/events.php:358 ../../view/theme/diabook/theme.php:92
-#: ../../include/nav.php:52 ../../boot.php:1791
+#: ../../mod/events.php:358 ../../view/theme/diabook/theme.php:91
+#: ../../include/nav.php:52 ../../boot.php:1836
 msgid "Events"
 msgstr ""
 
@@ -348,7 +348,7 @@ msgstr ""
 #: ../../mod/events.php:459 ../../mod/directory.php:134
 #: ../../addon/forumdirectory/forumdirectory.php:156
 #: ../../include/event.php:40 ../../include/bb2diaspora.php:415
-#: ../../boot.php:1312
+#: ../../boot.php:1358
 msgid "Location:"
 msgstr ""
 
@@ -360,11 +360,15 @@ msgstr ""
 msgid "Share this event"
 msgstr ""
 
+#: ../../mod/maintenance.php:5
+msgid "System down for maintenance"
+msgstr ""
+
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:145
 #: ../../mod/dfrn_request.php:848 ../../mod/settings.php:561
 #: ../../mod/settings.php:587 ../../mod/fbrowser.php:81
 #: ../../mod/fbrowser.php:116 ../../addon/js_upload/js_upload.php:45
-#: ../../include/conversation.php:1045
+#: ../../include/conversation.php:1040
 #: ../../addon.old/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr ""
@@ -417,8 +421,8 @@ msgstr ""
 #: ../../mod/settings.php:969 ../../mod/settings.php:975
 #: ../../mod/settings.php:1005 ../../mod/settings.php:1006
 #: ../../mod/settings.php:1007 ../../mod/settings.php:1008
-#: ../../mod/settings.php:1009 ../../mod/register.php:237
-#: ../../mod/profiles.php:584
+#: ../../mod/settings.php:1009 ../../mod/register.php:239
+#: ../../mod/profiles.php:606
 msgid "Yes"
 msgstr ""
 
@@ -429,20 +433,20 @@ msgstr ""
 #: ../../mod/settings.php:969 ../../mod/settings.php:975
 #: ../../mod/settings.php:1005 ../../mod/settings.php:1006
 #: ../../mod/settings.php:1007 ../../mod/settings.php:1008
-#: ../../mod/settings.php:1009 ../../mod/register.php:238
-#: ../../mod/profiles.php:585
+#: ../../mod/settings.php:1009 ../../mod/register.php:240
+#: ../../mod/profiles.php:607
 msgid "No"
 msgstr ""
 
-#: ../../mod/photos.php:51 ../../boot.php:1784
+#: ../../mod/photos.php:51 ../../boot.php:1829
 msgid "Photo Albums"
 msgstr ""
 
 #: ../../mod/photos.php:59 ../../mod/photos.php:154 ../../mod/photos.php:1009
 #: ../../mod/photos.php:1102 ../../mod/photos.php:1125
 #: ../../mod/photos.php:1626 ../../mod/photos.php:1638
-#: ../../addon/communityhome/communityhome.php:112
-#: ../../view/theme/diabook/theme.php:493
+#: ../../addon/communityhome/communityhome.php:115
+#: ../../view/theme/diabook/theme.php:492
 #: ../../addon.old/communityhome/communityhome.php:110
 msgid "Contact Photos"
 msgstr ""
@@ -464,9 +468,9 @@ msgstr ""
 #: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88
 #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
 #: ../../mod/profile_photo.php:305
-#: ../../addon/communityhome/communityhome.php:113
-#: ../../view/theme/diabook/theme.php:494 ../../include/user.php:324
-#: ../../include/user.php:331 ../../include/user.php:338
+#: ../../addon/communityhome/communityhome.php:116
+#: ../../view/theme/diabook/theme.php:493 ../../include/user.php:325
+#: ../../include/user.php:332 ../../include/user.php:339
 #: ../../addon.old/communityhome/communityhome.php:111
 msgid "Profile Photos"
 msgstr ""
@@ -513,7 +517,7 @@ msgstr ""
 
 #: ../../mod/photos.php:865 ../../mod/community.php:18
 #: ../../mod/dfrn_request.php:761 ../../mod/viewcontacts.php:17
-#: ../../mod/display.php:7 ../../mod/search.php:89 ../../mod/directory.php:31
+#: ../../mod/display.php:19 ../../mod/search.php:89 ../../mod/directory.php:31
 #: ../../addon/forumdirectory/forumdirectory.php:53
 msgid "Public access denied."
 msgstr ""
@@ -588,7 +592,7 @@ msgid "Use as profile photo"
 msgstr ""
 
 #: ../../mod/photos.php:1270 ../../mod/content.php:620
-#: ../../object/Item.php:105
+#: ../../object/Item.php:106
 msgid "Private Message"
 msgstr ""
 
@@ -629,16 +633,16 @@ msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
 #: ../../mod/photos.php:1420 ../../mod/content.php:684
-#: ../../object/Item.php:203
+#: ../../object/Item.php:204
 msgid "I like this (toggle)"
 msgstr ""
 
 #: ../../mod/photos.php:1421 ../../mod/content.php:685
-#: ../../object/Item.php:204
+#: ../../object/Item.php:205
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1422 ../../include/conversation.php:1005
+#: ../../mod/photos.php:1422 ../../include/conversation.php:1000
 msgid "Share"
 msgstr ""
 
@@ -646,33 +650,33 @@ msgstr ""
 #: ../../mod/content.php:499 ../../mod/content.php:883
 #: ../../mod/wallmessage.php:152 ../../mod/message.php:300
 #: ../../mod/message.php:528 ../../include/conversation.php:645
-#: ../../include/conversation.php:1024 ../../object/Item.php:287
+#: ../../include/conversation.php:1019 ../../object/Item.php:293
 msgid "Please wait"
 msgstr ""
 
 #: ../../mod/photos.php:1439 ../../mod/photos.php:1483
 #: ../../mod/photos.php:1566 ../../mod/content.php:707
-#: ../../object/Item.php:600
+#: ../../object/Item.php:601
 msgid "This is you"
 msgstr ""
 
 #: ../../mod/photos.php:1441 ../../mod/photos.php:1485
-#: ../../mod/photos.php:1568 ../../mod/content.php:709 ../../boot.php:635
-#: ../../object/Item.php:284 ../../object/Item.php:602
+#: ../../mod/photos.php:1568 ../../mod/content.php:709 ../../boot.php:641
+#: ../../object/Item.php:290 ../../object/Item.php:603
 msgid "Comment"
 msgstr ""
 
 #: ../../mod/photos.php:1443 ../../mod/photos.php:1487
 #: ../../mod/photos.php:1570 ../../mod/editpost.php:142
-#: ../../mod/content.php:719 ../../include/conversation.php:1042
-#: ../../object/Item.php:612
+#: ../../mod/content.php:719 ../../include/conversation.php:1037
+#: ../../object/Item.php:613
 msgid "Preview"
 msgstr ""
 
 #: ../../mod/photos.php:1527 ../../mod/content.php:439
 #: ../../mod/content.php:741 ../../mod/settings.php:623
 #: ../../mod/group.php:171 ../../mod/admin.php:735
-#: ../../include/conversation.php:569 ../../object/Item.php:119
+#: ../../include/conversation.php:569 ../../object/Item.php:120
 msgid "Delete"
 msgstr ""
 
@@ -688,7 +692,7 @@ msgstr ""
 msgid "Not available."
 msgstr ""
 
-#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:94
+#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93
 #: ../../include/nav.php:101
 msgid "Community"
 msgstr ""
@@ -738,96 +742,96 @@ msgstr ""
 msgid "Edit post"
 msgstr ""
 
-#: ../../mod/editpost.php:91 ../../include/conversation.php:991
+#: ../../mod/editpost.php:91 ../../include/conversation.php:986
 msgid "Post to Email"
 msgstr ""
 
 #: ../../mod/editpost.php:106 ../../mod/content.php:728
-#: ../../mod/settings.php:622 ../../object/Item.php:109
+#: ../../mod/settings.php:622 ../../object/Item.php:110
 msgid "Edit"
 msgstr ""
 
 #: ../../mod/editpost.php:107 ../../mod/wallmessage.php:150
 #: ../../mod/message.php:298 ../../mod/message.php:525
-#: ../../include/conversation.php:1006
+#: ../../include/conversation.php:1001
 msgid "Upload photo"
 msgstr ""
 
-#: ../../mod/editpost.php:108 ../../include/conversation.php:1007
+#: ../../mod/editpost.php:108 ../../include/conversation.php:1002
 msgid "upload photo"
 msgstr ""
 
-#: ../../mod/editpost.php:109 ../../include/conversation.php:1008
+#: ../../mod/editpost.php:109 ../../include/conversation.php:1003
 msgid "Attach file"
 msgstr ""
 
-#: ../../mod/editpost.php:110 ../../include/conversation.php:1009
+#: ../../mod/editpost.php:110 ../../include/conversation.php:1004
 msgid "attach file"
 msgstr ""
 
 #: ../../mod/editpost.php:111 ../../mod/wallmessage.php:151
 #: ../../mod/message.php:299 ../../mod/message.php:526
-#: ../../include/conversation.php:1010
+#: ../../include/conversation.php:1005
 msgid "Insert web link"
 msgstr ""
 
-#: ../../mod/editpost.php:112 ../../include/conversation.php:1011
+#: ../../mod/editpost.php:112 ../../include/conversation.php:1006
 msgid "web link"
 msgstr ""
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:1012
+#: ../../mod/editpost.php:113 ../../include/conversation.php:1007
 msgid "Insert video link"
 msgstr ""
 
-#: ../../mod/editpost.php:114 ../../include/conversation.php:1013
+#: ../../mod/editpost.php:114 ../../include/conversation.php:1008
 msgid "video link"
 msgstr ""
 
-#: ../../mod/editpost.php:115 ../../include/conversation.php:1014
+#: ../../mod/editpost.php:115 ../../include/conversation.php:1009
 msgid "Insert audio link"
 msgstr ""
 
-#: ../../mod/editpost.php:116 ../../include/conversation.php:1015
+#: ../../mod/editpost.php:116 ../../include/conversation.php:1010
 msgid "audio link"
 msgstr ""
 
-#: ../../mod/editpost.php:117 ../../include/conversation.php:1016
+#: ../../mod/editpost.php:117 ../../include/conversation.php:1011
 msgid "Set your location"
 msgstr ""
 
-#: ../../mod/editpost.php:118 ../../include/conversation.php:1017
+#: ../../mod/editpost.php:118 ../../include/conversation.php:1012
 msgid "set location"
 msgstr ""
 
-#: ../../mod/editpost.php:119 ../../include/conversation.php:1018
+#: ../../mod/editpost.php:119 ../../include/conversation.php:1013
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/editpost.php:120 ../../include/conversation.php:1019
+#: ../../mod/editpost.php:120 ../../include/conversation.php:1014
 msgid "clear location"
 msgstr ""
 
-#: ../../mod/editpost.php:122 ../../include/conversation.php:1025
+#: ../../mod/editpost.php:122 ../../include/conversation.php:1020
 msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/editpost.php:130 ../../include/conversation.php:1034
+#: ../../mod/editpost.php:130 ../../include/conversation.php:1029
 msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/editpost.php:131 ../../include/conversation.php:1035
+#: ../../mod/editpost.php:131 ../../include/conversation.php:1030
 msgid "Public post"
 msgstr ""
 
-#: ../../mod/editpost.php:134 ../../include/conversation.php:1021
+#: ../../mod/editpost.php:134 ../../include/conversation.php:1016
 msgid "Set title"
 msgstr ""
 
-#: ../../mod/editpost.php:136 ../../include/conversation.php:1023
+#: ../../mod/editpost.php:136 ../../include/conversation.php:1018
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../mod/editpost.php:137 ../../include/conversation.php:1037
+#: ../../mod/editpost.php:137 ../../include/conversation.php:1032
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
@@ -1051,8 +1055,8 @@ msgstr ""
 #: ../../mod/uexport.php:48 ../../mod/settings.php:74
 #: ../../mod/newmember.php:22 ../../mod/admin.php:824 ../../mod/admin.php:1029
 #: ../../addon/dav/friendica/layout.fnk.php:225
-#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:538
-#: ../../view/theme/diabook/theme.php:659 ../../include/nav.php:140
+#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537
+#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:140
 #: ../../addon.old/dav/friendica/layout.fnk.php:225
 #: ../../addon.old/mathjax/mathjax.php:36
 msgid "Settings"
@@ -1428,7 +1432,7 @@ msgid "is interested in:"
 msgstr ""
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1250
+#: ../../include/contact_widgets.php:9 ../../boot.php:1296
 msgid "Connect"
 msgstr ""
 
@@ -1458,19 +1462,19 @@ msgid "Group: "
 msgstr ""
 
 #: ../../mod/content.php:438 ../../mod/content.php:740
-#: ../../include/conversation.php:568 ../../object/Item.php:118
+#: ../../include/conversation.php:568 ../../object/Item.php:119
 msgid "Select"
 msgstr ""
 
 #: ../../mod/content.php:472 ../../mod/content.php:852
 #: ../../mod/content.php:853 ../../include/conversation.php:608
-#: ../../object/Item.php:252 ../../object/Item.php:253
+#: ../../object/Item.php:258 ../../object/Item.php:259
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 
 #: ../../mod/content.php:482 ../../mod/content.php:864
-#: ../../include/conversation.php:628 ../../object/Item.php:266
+#: ../../include/conversation.php:628 ../../object/Item.php:272
 #, php-format
 msgid "%s from %s"
 msgstr ""
@@ -1479,7 +1483,7 @@ msgstr ""
 msgid "View in context"
 msgstr ""
 
-#: ../../mod/content.php:603 ../../object/Item.php:306
+#: ../../mod/content.php:603 ../../object/Item.php:313
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
@@ -1487,7 +1491,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../../mod/content.php:605 ../../include/text.php:1502
-#: ../../object/Item.php:308 ../../object/Item.php:321
+#: ../../object/Item.php:315 ../../object/Item.php:328
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] ""
@@ -1495,97 +1499,97 @@ msgstr[1] ""
 
 #: ../../mod/content.php:606 ../../addon/page/page.php:77
 #: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119
-#: ../../include/contact_widgets.php:204 ../../boot.php:636
-#: ../../object/Item.php:309 ../../addon.old/page/page.php:77
+#: ../../include/contact_widgets.php:204 ../../boot.php:642
+#: ../../object/Item.php:316 ../../addon.old/page/page.php:77
 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119
 msgid "show more"
 msgstr ""
 
-#: ../../mod/content.php:684 ../../object/Item.php:203
+#: ../../mod/content.php:684 ../../object/Item.php:204
 msgid "like"
 msgstr ""
 
-#: ../../mod/content.php:685 ../../object/Item.php:204
+#: ../../mod/content.php:685 ../../object/Item.php:205
 msgid "dislike"
 msgstr ""
 
-#: ../../mod/content.php:687 ../../object/Item.php:206
+#: ../../mod/content.php:687 ../../object/Item.php:207
 msgid "Share this"
 msgstr ""
 
-#: ../../mod/content.php:687 ../../object/Item.php:206
+#: ../../mod/content.php:687 ../../object/Item.php:207
 msgid "share"
 msgstr ""
 
-#: ../../mod/content.php:711 ../../object/Item.php:604
+#: ../../mod/content.php:711 ../../object/Item.php:605
 msgid "Bold"
 msgstr ""
 
-#: ../../mod/content.php:712 ../../object/Item.php:605
+#: ../../mod/content.php:712 ../../object/Item.php:606
 msgid "Italic"
 msgstr ""
 
-#: ../../mod/content.php:713 ../../object/Item.php:606
+#: ../../mod/content.php:713 ../../object/Item.php:607
 msgid "Underline"
 msgstr ""
 
-#: ../../mod/content.php:714 ../../object/Item.php:607
+#: ../../mod/content.php:714 ../../object/Item.php:608
 msgid "Quote"
 msgstr ""
 
-#: ../../mod/content.php:715 ../../object/Item.php:608
+#: ../../mod/content.php:715 ../../object/Item.php:609
 msgid "Code"
 msgstr ""
 
-#: ../../mod/content.php:716 ../../object/Item.php:609
+#: ../../mod/content.php:716 ../../object/Item.php:610
 msgid "Image"
 msgstr ""
 
-#: ../../mod/content.php:717 ../../object/Item.php:610
+#: ../../mod/content.php:717 ../../object/Item.php:611
 msgid "Link"
 msgstr ""
 
-#: ../../mod/content.php:718 ../../object/Item.php:611
+#: ../../mod/content.php:718 ../../object/Item.php:612
 msgid "Video"
 msgstr ""
 
-#: ../../mod/content.php:753 ../../object/Item.php:182
+#: ../../mod/content.php:753 ../../object/Item.php:183
 msgid "add star"
 msgstr ""
 
-#: ../../mod/content.php:754 ../../object/Item.php:183
+#: ../../mod/content.php:754 ../../object/Item.php:184
 msgid "remove star"
 msgstr ""
 
-#: ../../mod/content.php:755 ../../object/Item.php:184
+#: ../../mod/content.php:755 ../../object/Item.php:185
 msgid "toggle star status"
 msgstr ""
 
-#: ../../mod/content.php:758 ../../object/Item.php:187
+#: ../../mod/content.php:758 ../../object/Item.php:188
 msgid "starred"
 msgstr ""
 
-#: ../../mod/content.php:759 ../../object/Item.php:192
+#: ../../mod/content.php:759 ../../object/Item.php:193
 msgid "add tag"
 msgstr ""
 
-#: ../../mod/content.php:763 ../../object/Item.php:122
+#: ../../mod/content.php:763 ../../object/Item.php:123
 msgid "save to folder"
 msgstr ""
 
-#: ../../mod/content.php:854 ../../object/Item.php:254
+#: ../../mod/content.php:854 ../../object/Item.php:260
 msgid "to"
 msgstr ""
 
-#: ../../mod/content.php:855 ../../object/Item.php:256
+#: ../../mod/content.php:855 ../../object/Item.php:262
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../mod/content.php:856 ../../object/Item.php:257
+#: ../../mod/content.php:856 ../../object/Item.php:263
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:183
+#: ../../mod/home.php:34 ../../addon/communityhome/communityhome.php:189
 #: ../../addon.old/communityhome/communityhome.php:179
 #, php-format
 msgid "Welcome to %s"
@@ -1618,7 +1622,7 @@ msgstr ""
 msgid "Personal"
 msgstr ""
 
-#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:88
+#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87
 #: ../../include/nav.php:77 ../../include/nav.php:116
 msgid "Home"
 msgstr ""
@@ -2063,7 +2067,7 @@ msgstr ""
 msgid "Edit contact"
 msgstr ""
 
-#: ../../mod/contacts.php:575 ../../view/theme/diabook/theme.php:90
+#: ../../mod/contacts.php:575 ../../view/theme/diabook/theme.php:89
 #: ../../include/nav.php:144
 msgid "Contacts"
 msgstr ""
@@ -2083,81 +2087,71 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
-#: ../../mod/lostpass.php:16
+#: ../../mod/lostpass.php:17
 msgid "No valid account found."
 msgstr ""
 
-#: ../../mod/lostpass.php:32
+#: ../../mod/lostpass.php:33
 msgid "Password reset request issued. Check your email."
 msgstr ""
 
-#: ../../mod/lostpass.php:43
+#: ../../mod/lostpass.php:44
 #, php-format
 msgid "Password reset requested at %s"
 msgstr ""
 
-#: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
-#: ../../mod/register.php:91 ../../mod/register.php:145
-#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752
-#: ../../addon/facebook/facebook.php:702
-#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:805
-#: ../../addon/public_server/public_server.php:62
-#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3375
-#: ../../boot.php:852 ../../addon.old/facebook/facebook.php:702
-#: ../../addon.old/facebook/facebook.php:1200
-#: ../../addon.old/fbpost/fbpost.php:661
-#: ../../addon.old/public_server/public_server.php:62
-#: ../../addon.old/testdrive/testdrive.php:67
-msgid "Administrator"
-msgstr ""
-
-#: ../../mod/lostpass.php:65
+#: ../../mod/lostpass.php:66
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:83 ../../boot.php:990
+#: ../../mod/lostpass.php:84 ../../boot.php:1030
 msgid "Password Reset"
 msgstr ""
 
-#: ../../mod/lostpass.php:84
+#: ../../mod/lostpass.php:85
 msgid "Your password has been reset as requested."
 msgstr ""
 
-#: ../../mod/lostpass.php:85
+#: ../../mod/lostpass.php:86
 msgid "Your new password is"
 msgstr ""
 
-#: ../../mod/lostpass.php:86
+#: ../../mod/lostpass.php:87
 msgid "Save or copy your new password - and then"
 msgstr ""
 
-#: ../../mod/lostpass.php:87
+#: ../../mod/lostpass.php:88
 msgid "click here to login"
 msgstr ""
 
-#: ../../mod/lostpass.php:88
+#: ../../mod/lostpass.php:89
 msgid ""
 "Your password may be changed from the <em>Settings</em> page after "
 "successful login."
 msgstr ""
 
-#: ../../mod/lostpass.php:119
+#: ../../mod/lostpass.php:107
+#, php-format
+msgid "Your password has been changed at %s"
+msgstr ""
+
+#: ../../mod/lostpass.php:122
 msgid "Forgot your Password?"
 msgstr ""
 
-#: ../../mod/lostpass.php:120
+#: ../../mod/lostpass.php:123
 msgid ""
 "Enter your email address and submit to have your password reset. Then check "
 "your email for further instructions."
 msgstr ""
 
-#: ../../mod/lostpass.php:121
+#: ../../mod/lostpass.php:124
 msgid "Nickname or Email: "
 msgstr ""
 
-#: ../../mod/lostpass.php:122
+#: ../../mod/lostpass.php:125
 msgid "Reset"
 msgstr ""
 
@@ -2225,13 +2219,13 @@ msgstr ""
 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr ""
 
-#: ../../mod/settings.php:488 ../../addon/facebook/facebook.php:495
-#: ../../addon/fbpost/fbpost.php:151
+#: ../../mod/settings.php:488 ../../addon/facebook/facebook.php:497
+#: ../../addon/fbpost/fbpost.php:155
 #: ../../addon/remote_permissions/remote_permissions.php:205
 #: ../../addon/impressum/impressum.php:78
-#: ../../addon/openstreetmap/openstreetmap.php:80
+#: ../../addon/openstreetmap/openstreetmap.php:104
 #: ../../addon/altpager/altpager.php:107 ../../addon/mathjax/mathjax.php:66
-#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:504
+#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:548
 #: ../../addon.old/facebook/facebook.php:495
 #: ../../addon.old/fbpost/fbpost.php:144
 #: ../../addon.old/impressum/impressum.php:78
@@ -2247,13 +2241,13 @@ msgid "Add application"
 msgstr ""
 
 #: ../../mod/settings.php:563 ../../mod/settings.php:589
-#: ../../addon/statusnet/statusnet.php:697
+#: ../../addon/statusnet/statusnet.php:747
 #: ../../addon.old/statusnet/statusnet.php:570
 msgid "Consumer Key"
 msgstr ""
 
 #: ../../mod/settings.php:564 ../../mod/settings.php:590
-#: ../../addon/statusnet/statusnet.php:696
+#: ../../addon/statusnet/statusnet.php:746
 #: ../../addon.old/statusnet/statusnet.php:569
 msgid "Consumer Secret"
 msgstr ""
@@ -2359,7 +2353,7 @@ msgid "Security:"
 msgstr ""
 
 #: ../../mod/settings.php:732 ../../mod/settings.php:737
-#: ../../addon/fbpost/fbpost.php:247 ../../addon/fbpost/fbpost.php:249
+#: ../../addon/fbpost/fbpost.php:255 ../../addon/fbpost/fbpost.php:257
 #: ../../addon/dav/common/wdcal_edit.inc.php:191
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:191
 msgid "None"
@@ -2792,14 +2786,14 @@ msgstr ""
 msgid "Invalid contact."
 msgstr ""
 
-#: ../../mod/notes.php:44 ../../boot.php:1798
+#: ../../mod/notes.php:44 ../../boot.php:1843
 msgid "Personal Notes"
 msgstr ""
 
 #: ../../mod/notes.php:63 ../../mod/filer.php:31
-#: ../../addon/facebook/facebook.php:770
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:346
-#: ../../addon/fbpost/fbpost.php:314
+#: ../../addon/facebook/facebook.php:772
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:354
+#: ../../addon/fbpost/fbpost.php:322
 #: ../../addon/dav/friendica/layout.fnk.php:441
 #: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:741
 #: ../../addon.old/facebook/facebook.php:770
@@ -2810,7 +2804,7 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: ../../mod/uimport.php:50 ../../mod/register.php:190
+#: ../../mod/uimport.php:50 ../../mod/register.php:192
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
@@ -2883,7 +2877,7 @@ msgstr ""
 #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
 #: ../../mod/message.php:249 ../../mod/message.php:257
 #: ../../mod/message.php:429 ../../mod/message.php:437
-#: ../../include/conversation.php:941 ../../include/conversation.php:959
+#: ../../include/conversation.php:936 ../../include/conversation.php:954
 msgid "Please enter a link URL:"
 msgstr ""
 
@@ -2909,7 +2903,7 @@ msgid "Subject:"
 msgstr ""
 
 #: ../../mod/wallmessage.php:147 ../../mod/message.php:295
-#: ../../mod/message.php:521 ../../mod/invite.php:113
+#: ../../mod/message.php:521 ../../mod/invite.php:115
 msgid "Your message:"
 msgstr ""
 
@@ -2964,9 +2958,9 @@ msgid ""
 msgstr ""
 
 #: ../../mod/newmember.php:32 ../../mod/profperm.php:103
-#: ../../view/theme/diabook/theme.php:89 ../../include/profile_advanced.php:7
+#: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7
 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50
-#: ../../boot.php:1774
+#: ../../boot.php:1819
 msgid "Profile"
 msgstr ""
 
@@ -3008,7 +3002,7 @@ msgid "Connecting"
 msgstr ""
 
 #: ../../mod/newmember.php:49 ../../mod/newmember.php:51
-#: ../../addon/facebook/facebook.php:728 ../../addon/fbpost/fbpost.php:286
+#: ../../addon/facebook/facebook.php:730 ../../addon/fbpost/fbpost.php:294
 #: ../../include/contact_selectors.php:81
 #: ../../addon.old/facebook/facebook.php:728
 #: ../../addon.old/fbpost/fbpost.php:239
@@ -3137,7 +3131,7 @@ msgstr ""
 msgid "Group name changed."
 msgstr ""
 
-#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:332
+#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:339
 msgid "Permission denied"
 msgstr ""
 
@@ -3165,7 +3159,7 @@ msgstr ""
 msgid "Members"
 msgstr ""
 
-#: ../../mod/group.php:223 ../../mod/profperm.php:105
+#: ../../mod/group.php:224 ../../mod/profperm.php:105
 msgid "Click on a contact to add or remove."
 msgstr ""
 
@@ -3193,85 +3187,85 @@ msgstr ""
 msgid "View Contacts"
 msgstr ""
 
-#: ../../mod/register.php:89 ../../mod/regmod.php:52
+#: ../../mod/register.php:91 ../../mod/regmod.php:54
 #, php-format
 msgid "Registration details for %s"
 msgstr ""
 
-#: ../../mod/register.php:97
+#: ../../mod/register.php:99
 msgid ""
 "Registration successful. Please check your email for further instructions."
 msgstr ""
 
-#: ../../mod/register.php:101
+#: ../../mod/register.php:103
 msgid "Failed to send email message. Here is the message that failed."
 msgstr ""
 
-#: ../../mod/register.php:106
+#: ../../mod/register.php:108
 msgid "Your registration can not be processed."
 msgstr ""
 
-#: ../../mod/register.php:143
+#: ../../mod/register.php:145
 #, php-format
 msgid "Registration request at %s"
 msgstr ""
 
-#: ../../mod/register.php:152
+#: ../../mod/register.php:154
 msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: ../../mod/register.php:218
+#: ../../mod/register.php:220
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr ""
 
-#: ../../mod/register.php:219
+#: ../../mod/register.php:221
 msgid ""
 "If you are not familiar with OpenID, please leave that field blank and fill "
 "in the rest of the items."
 msgstr ""
 
-#: ../../mod/register.php:220
+#: ../../mod/register.php:222
 msgid "Your OpenID (optional): "
 msgstr ""
 
-#: ../../mod/register.php:234
+#: ../../mod/register.php:236
 msgid "Include your profile in member directory?"
 msgstr ""
 
-#: ../../mod/register.php:256
+#: ../../mod/register.php:257
 msgid "Membership on this site is by invitation only."
 msgstr ""
 
-#: ../../mod/register.php:257
+#: ../../mod/register.php:258
 msgid "Your invitation ID: "
 msgstr ""
 
-#: ../../mod/register.php:260 ../../mod/admin.php:462
+#: ../../mod/register.php:261 ../../mod/admin.php:462
 msgid "Registration"
 msgstr ""
 
-#: ../../mod/register.php:268
+#: ../../mod/register.php:269
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr ""
 
-#: ../../mod/register.php:269
+#: ../../mod/register.php:270
 msgid "Your Email Address: "
 msgstr ""
 
-#: ../../mod/register.php:270
+#: ../../mod/register.php:271
 msgid ""
 "Choose a profile nickname. This must begin with a text character. Your "
 "profile address on this site will then be '<strong>nickname@$sitename</"
 "strong>'."
 msgstr ""
 
-#: ../../mod/register.php:271
+#: ../../mod/register.php:272
 msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:951
+#: ../../mod/register.php:275 ../../include/nav.php:81 ../../boot.php:991
 msgid "Register"
 msgstr ""
 
@@ -3280,20 +3274,20 @@ msgid "People Search"
 msgstr ""
 
 #: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62
-#: ../../addon/communityhome/communityhome.php:166
-#: ../../view/theme/diabook/theme.php:465 ../../include/text.php:1498
-#: ../../include/diaspora.php:1851 ../../include/conversation.php:125
+#: ../../addon/communityhome/communityhome.php:171
+#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1498
+#: ../../include/diaspora.php:1860 ../../include/conversation.php:125
 #: ../../include/conversation.php:253
 #: ../../addon.old/communityhome/communityhome.php:163
 msgid "photo"
 msgstr ""
 
 #: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/subthread.php:87
-#: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598
-#: ../../addon/communityhome/communityhome.php:161
-#: ../../addon/communityhome/communityhome.php:170
-#: ../../view/theme/diabook/theme.php:460
-#: ../../view/theme/diabook/theme.php:469 ../../include/diaspora.php:1851
+#: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1600
+#: ../../addon/communityhome/communityhome.php:166
+#: ../../addon/communityhome/communityhome.php:175
+#: ../../view/theme/diabook/theme.php:459
+#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1860
 #: ../../include/conversation.php:120 ../../include/conversation.php:129
 #: ../../include/conversation.php:248 ../../include/conversation.php:257
 #: ../../addon.old/facebook/facebook.php:1598
@@ -3302,9 +3296,9 @@ msgstr ""
 msgid "status"
 msgstr ""
 
-#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602
-#: ../../addon/communityhome/communityhome.php:175
-#: ../../view/theme/diabook/theme.php:474 ../../include/diaspora.php:1867
+#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1604
+#: ../../addon/communityhome/communityhome.php:180
+#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1876
 #: ../../include/conversation.php:136
 #: ../../addon.old/facebook/facebook.php:1602
 #: ../../addon.old/communityhome/communityhome.php:172
@@ -3318,8 +3312,8 @@ msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
-#: ../../mod/admin.php:773 ../../mod/admin.php:972 ../../mod/display.php:39
-#: ../../mod/display.php:169 ../../include/items.php:3853
+#: ../../mod/admin.php:773 ../../mod/admin.php:972 ../../mod/display.php:51
+#: ../../mod/display.php:184 ../../include/items.php:3853
 msgid "Item not found."
 msgstr ""
 
@@ -3327,8 +3321,8 @@ msgstr ""
 msgid "Access denied."
 msgstr ""
 
-#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:91
-#: ../../include/nav.php:51 ../../boot.php:1781
+#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90
+#: ../../include/nav.php:51 ../../boot.php:1826
 msgid "Photos"
 msgstr ""
 
@@ -3336,16 +3330,16 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: ../../mod/regmod.php:61
+#: ../../mod/regmod.php:63
 msgid "Account approved."
 msgstr ""
 
-#: ../../mod/regmod.php:98
+#: ../../mod/regmod.php:100
 #, php-format
 msgid "Registration revoked for %s"
 msgstr ""
 
-#: ../../mod/regmod.php:110
+#: ../../mod/regmod.php:112
 msgid "Please login."
 msgstr ""
 
@@ -3698,7 +3692,7 @@ msgstr ""
 msgid "Performance"
 msgstr ""
 
-#: ../../mod/admin.php:470 ../../addon/statusnet/statusnet.php:694
+#: ../../mod/admin.php:470 ../../addon/statusnet/statusnet.php:744
 #: ../../addon.old/statusnet/statusnet.php:567
 msgid "Site name"
 msgstr ""
@@ -4265,15 +4259,15 @@ msgstr ""
 msgid "FTP Password"
 msgstr ""
 
-#: ../../mod/profile.php:21 ../../boot.php:1160
+#: ../../mod/profile.php:21 ../../boot.php:1204
 msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../mod/profile.php:156 ../../mod/display.php:87
+#: ../../mod/profile.php:155 ../../mod/display.php:99
 msgid "Access to this profile has been restricted."
 msgstr ""
 
-#: ../../mod/profile.php:181
+#: ../../mod/profile.php:180
 msgid "Tips for New Members"
 msgstr ""
 
@@ -4361,7 +4355,7 @@ msgstr ""
 msgid "link"
 msgstr ""
 
-#: ../../mod/display.php:162
+#: ../../mod/display.php:177
 msgid "Item has been removed."
 msgstr ""
 
@@ -4378,321 +4372,322 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: ../../mod/profiles.php:21 ../../mod/profiles.php:441
-#: ../../mod/profiles.php:555 ../../mod/dfrn_confirm.php:62
+#: ../../mod/profiles.php:18 ../../mod/profiles.php:133
+#: ../../mod/profiles.php:160 ../../mod/profiles.php:579
+#: ../../mod/dfrn_confirm.php:62
 msgid "Profile not found."
 msgstr ""
 
-#: ../../mod/profiles.php:31
+#: ../../mod/profiles.php:37
+msgid "Profile deleted."
+msgstr ""
+
+#: ../../mod/profiles.php:55 ../../mod/profiles.php:89
+msgid "Profile-"
+msgstr ""
+
+#: ../../mod/profiles.php:74 ../../mod/profiles.php:117
+msgid "New profile created."
+msgstr ""
+
+#: ../../mod/profiles.php:95
+msgid "Profile unavailable to clone."
+msgstr ""
+
+#: ../../mod/profiles.php:170
 msgid "Profile Name is required."
 msgstr ""
 
-#: ../../mod/profiles.php:178
+#: ../../mod/profiles.php:317
 msgid "Marital Status"
 msgstr ""
 
-#: ../../mod/profiles.php:182
+#: ../../mod/profiles.php:321
 msgid "Romantic Partner"
 msgstr ""
 
-#: ../../mod/profiles.php:186
+#: ../../mod/profiles.php:325
 msgid "Likes"
 msgstr ""
 
-#: ../../mod/profiles.php:190
+#: ../../mod/profiles.php:329
 msgid "Dislikes"
 msgstr ""
 
-#: ../../mod/profiles.php:194
+#: ../../mod/profiles.php:333
 msgid "Work/Employment"
 msgstr ""
 
-#: ../../mod/profiles.php:197
+#: ../../mod/profiles.php:336
 msgid "Religion"
 msgstr ""
 
-#: ../../mod/profiles.php:201
+#: ../../mod/profiles.php:340
 msgid "Political Views"
 msgstr ""
 
-#: ../../mod/profiles.php:205
+#: ../../mod/profiles.php:344
 msgid "Gender"
 msgstr ""
 
-#: ../../mod/profiles.php:209
+#: ../../mod/profiles.php:348
 msgid "Sexual Preference"
 msgstr ""
 
-#: ../../mod/profiles.php:213
+#: ../../mod/profiles.php:352
 msgid "Homepage"
 msgstr ""
 
-#: ../../mod/profiles.php:217
+#: ../../mod/profiles.php:356
 msgid "Interests"
 msgstr ""
 
-#: ../../mod/profiles.php:221
+#: ../../mod/profiles.php:360
 msgid "Address"
 msgstr ""
 
-#: ../../mod/profiles.php:228 ../../addon/dav/common/wdcal_edit.inc.php:183
+#: ../../mod/profiles.php:367 ../../addon/dav/common/wdcal_edit.inc.php:183
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:183
 msgid "Location"
 msgstr ""
 
-#: ../../mod/profiles.php:311
+#: ../../mod/profiles.php:450
 msgid "Profile updated."
 msgstr ""
 
-#: ../../mod/profiles.php:378
+#: ../../mod/profiles.php:517
 msgid " and "
 msgstr ""
 
-#: ../../mod/profiles.php:386
+#: ../../mod/profiles.php:525
 msgid "public profile"
 msgstr ""
 
-#: ../../mod/profiles.php:389
+#: ../../mod/profiles.php:528
 #, php-format
 msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
 msgstr ""
 
-#: ../../mod/profiles.php:390
+#: ../../mod/profiles.php:529
 #, php-format
 msgid " - Visit %1$s's %2$s"
 msgstr ""
 
-#: ../../mod/profiles.php:393
+#: ../../mod/profiles.php:532
 #, php-format
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: ../../mod/profiles.php:460
-msgid "Profile deleted."
-msgstr ""
-
-#: ../../mod/profiles.php:478 ../../mod/profiles.php:512
-msgid "Profile-"
-msgstr ""
-
-#: ../../mod/profiles.php:497 ../../mod/profiles.php:539
-msgid "New profile created."
-msgstr ""
-
-#: ../../mod/profiles.php:518
-msgid "Profile unavailable to clone."
-msgstr ""
-
-#: ../../mod/profiles.php:583
+#: ../../mod/profiles.php:605
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr ""
 
-#: ../../mod/profiles.php:603
+#: ../../mod/profiles.php:625
 msgid "Edit Profile Details"
 msgstr ""
 
-#: ../../mod/profiles.php:605
+#: ../../mod/profiles.php:627
 msgid "Change Profile Photo"
 msgstr ""
 
-#: ../../mod/profiles.php:606
+#: ../../mod/profiles.php:628
 msgid "View this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:607
+#: ../../mod/profiles.php:629
 msgid "Create a new profile using these settings"
 msgstr ""
 
-#: ../../mod/profiles.php:608
+#: ../../mod/profiles.php:630
 msgid "Clone this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:609
+#: ../../mod/profiles.php:631
 msgid "Delete this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:610
+#: ../../mod/profiles.php:632
 msgid "Profile Name:"
 msgstr ""
 
-#: ../../mod/profiles.php:611
+#: ../../mod/profiles.php:633
 msgid "Your Full Name:"
 msgstr ""
 
-#: ../../mod/profiles.php:612
+#: ../../mod/profiles.php:634
 msgid "Title/Description:"
 msgstr ""
 
-#: ../../mod/profiles.php:613
+#: ../../mod/profiles.php:635
 msgid "Your Gender:"
 msgstr ""
 
-#: ../../mod/profiles.php:614
+#: ../../mod/profiles.php:636
 #, php-format
 msgid "Birthday (%s):"
 msgstr ""
 
-#: ../../mod/profiles.php:615
+#: ../../mod/profiles.php:637
 msgid "Street Address:"
 msgstr ""
 
-#: ../../mod/profiles.php:616
+#: ../../mod/profiles.php:638
 msgid "Locality/City:"
 msgstr ""
 
-#: ../../mod/profiles.php:617
+#: ../../mod/profiles.php:639
 msgid "Postal/Zip Code:"
 msgstr ""
 
-#: ../../mod/profiles.php:618
+#: ../../mod/profiles.php:640
 msgid "Country:"
 msgstr ""
 
-#: ../../mod/profiles.php:619
+#: ../../mod/profiles.php:641
 msgid "Region/State:"
 msgstr ""
 
-#: ../../mod/profiles.php:620
+#: ../../mod/profiles.php:642
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr ""
 
-#: ../../mod/profiles.php:621
+#: ../../mod/profiles.php:643
 msgid "Who: (if applicable)"
 msgstr ""
 
-#: ../../mod/profiles.php:622
+#: ../../mod/profiles.php:644
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: ../../mod/profiles.php:623
+#: ../../mod/profiles.php:645
 msgid "Since [date]:"
 msgstr ""
 
-#: ../../mod/profiles.php:624 ../../include/profile_advanced.php:46
+#: ../../mod/profiles.php:646 ../../include/profile_advanced.php:46
 msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../mod/profiles.php:625
+#: ../../mod/profiles.php:647
 msgid "Homepage URL:"
 msgstr ""
 
-#: ../../mod/profiles.php:626 ../../include/profile_advanced.php:50
+#: ../../mod/profiles.php:648 ../../include/profile_advanced.php:50
 msgid "Hometown:"
 msgstr ""
 
-#: ../../mod/profiles.php:627 ../../include/profile_advanced.php:54
+#: ../../mod/profiles.php:649 ../../include/profile_advanced.php:54
 msgid "Political Views:"
 msgstr ""
 
-#: ../../mod/profiles.php:628
+#: ../../mod/profiles.php:650
 msgid "Religious Views:"
 msgstr ""
 
-#: ../../mod/profiles.php:629
+#: ../../mod/profiles.php:651
 msgid "Public Keywords:"
 msgstr ""
 
-#: ../../mod/profiles.php:630
+#: ../../mod/profiles.php:652
 msgid "Private Keywords:"
 msgstr ""
 
-#: ../../mod/profiles.php:631 ../../include/profile_advanced.php:62
+#: ../../mod/profiles.php:653 ../../include/profile_advanced.php:62
 msgid "Likes:"
 msgstr ""
 
-#: ../../mod/profiles.php:632 ../../include/profile_advanced.php:64
+#: ../../mod/profiles.php:654 ../../include/profile_advanced.php:64
 msgid "Dislikes:"
 msgstr ""
 
-#: ../../mod/profiles.php:633
+#: ../../mod/profiles.php:655
 msgid "Example: fishing photography software"
 msgstr ""
 
-#: ../../mod/profiles.php:634
+#: ../../mod/profiles.php:656
 msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr ""
 
-#: ../../mod/profiles.php:635
+#: ../../mod/profiles.php:657
 msgid "(Used for searching profiles, never shown to others)"
 msgstr ""
 
-#: ../../mod/profiles.php:636
+#: ../../mod/profiles.php:658
 msgid "Tell us about yourself..."
 msgstr ""
 
-#: ../../mod/profiles.php:637
+#: ../../mod/profiles.php:659
 msgid "Hobbies/Interests"
 msgstr ""
 
-#: ../../mod/profiles.php:638
+#: ../../mod/profiles.php:660
 msgid "Contact information and Social Networks"
 msgstr ""
 
-#: ../../mod/profiles.php:639
+#: ../../mod/profiles.php:661
 msgid "Musical interests"
 msgstr ""
 
-#: ../../mod/profiles.php:640
+#: ../../mod/profiles.php:662
 msgid "Books, literature"
 msgstr ""
 
-#: ../../mod/profiles.php:641
+#: ../../mod/profiles.php:663
 msgid "Television"
 msgstr ""
 
-#: ../../mod/profiles.php:642
+#: ../../mod/profiles.php:664
 msgid "Film/dance/culture/entertainment"
 msgstr ""
 
-#: ../../mod/profiles.php:643
+#: ../../mod/profiles.php:665
 msgid "Love/romance"
 msgstr ""
 
-#: ../../mod/profiles.php:644
+#: ../../mod/profiles.php:666
 msgid "Work/employment"
 msgstr ""
 
-#: ../../mod/profiles.php:645
+#: ../../mod/profiles.php:667
 msgid "School/education"
 msgstr ""
 
-#: ../../mod/profiles.php:650
+#: ../../mod/profiles.php:672
 msgid ""
 "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
 "be visible to anybody using the internet."
 msgstr ""
 
-#: ../../mod/profiles.php:660 ../../mod/directory.php:111
+#: ../../mod/profiles.php:682 ../../mod/directory.php:111
 #: ../../addon/forumdirectory/forumdirectory.php:133
 msgid "Age: "
 msgstr ""
 
-#: ../../mod/profiles.php:699
+#: ../../mod/profiles.php:721
 msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/profiles.php:700 ../../boot.php:1278
+#: ../../mod/profiles.php:722 ../../boot.php:1324
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/profiles.php:701 ../../boot.php:1279
+#: ../../mod/profiles.php:723 ../../boot.php:1325
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/profiles.php:712 ../../boot.php:1289
+#: ../../mod/profiles.php:734 ../../boot.php:1335
 msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/profiles.php:714 ../../boot.php:1292
+#: ../../mod/profiles.php:736 ../../boot.php:1338
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../mod/profiles.php:715 ../../boot.php:1293
+#: ../../mod/profiles.php:737 ../../boot.php:1339
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../mod/filer.php:30 ../../include/conversation.php:945
-#: ../../include/conversation.php:963
+#: ../../mod/filer.php:30 ../../include/conversation.php:940
+#: ../../include/conversation.php:958
 msgid "Save to Folder:"
 msgstr ""
 
@@ -4753,38 +4748,42 @@ msgid "Source input: "
 msgstr ""
 
 #: ../../mod/babel.php:35
-msgid "bb2html: "
+msgid "bb2html (raw HTML): "
 msgstr ""
 
 #: ../../mod/babel.php:39
-msgid "bb2html2bb: "
+msgid "bb2html: "
 msgstr ""
 
 #: ../../mod/babel.php:43
-msgid "bb2md: "
+msgid "bb2html2bb: "
 msgstr ""
 
 #: ../../mod/babel.php:47
-msgid "bb2md2html: "
+msgid "bb2md: "
 msgstr ""
 
 #: ../../mod/babel.php:51
-msgid "bb2dia2bb: "
+msgid "bb2md2html: "
 msgstr ""
 
 #: ../../mod/babel.php:55
+msgid "bb2dia2bb: "
+msgstr ""
+
+#: ../../mod/babel.php:59
 msgid "bb2md2html2bb: "
 msgstr ""
 
-#: ../../mod/babel.php:65
+#: ../../mod/babel.php:69
 msgid "Source input (Diaspora format): "
 msgstr ""
 
-#: ../../mod/babel.php:70
+#: ../../mod/babel.php:74
 msgid "diaspora2bb: "
 msgstr ""
 
-#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:521
+#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:520
 #: ../../include/contact_widgets.php:34
 msgid "Friend Suggestions"
 msgstr ""
@@ -4800,7 +4799,7 @@ msgid "Ignore/Hide"
 msgstr ""
 
 #: ../../mod/directory.php:49 ../../addon/forumdirectory/forumdirectory.php:71
-#: ../../view/theme/diabook/theme.php:519
+#: ../../view/theme/diabook/theme.php:518
 msgid "Global Directory"
 msgstr ""
 
@@ -4819,19 +4818,19 @@ msgstr ""
 
 #: ../../mod/directory.php:136
 #: ../../addon/forumdirectory/forumdirectory.php:158
-#: ../../include/profile_advanced.php:17 ../../boot.php:1314
+#: ../../include/profile_advanced.php:17 ../../boot.php:1360
 msgid "Gender:"
 msgstr ""
 
 #: ../../mod/directory.php:138
 #: ../../addon/forumdirectory/forumdirectory.php:160
-#: ../../include/profile_advanced.php:37 ../../boot.php:1317
+#: ../../include/profile_advanced.php:37 ../../boot.php:1363
 msgid "Status:"
 msgstr ""
 
 #: ../../mod/directory.php:140
 #: ../../addon/forumdirectory/forumdirectory.php:162
-#: ../../include/profile_advanced.php:48 ../../boot.php:1319
+#: ../../include/profile_advanced.php:48 ../../boot.php:1365
 msgid "Homepage:"
 msgstr ""
 
@@ -4846,32 +4845,32 @@ msgstr ""
 msgid "No entries (some entries may be hidden)."
 msgstr ""
 
-#: ../../mod/invite.php:35
+#: ../../mod/invite.php:37
 #, php-format
 msgid "%s : Not a valid email address."
 msgstr ""
 
-#: ../../mod/invite.php:59
+#: ../../mod/invite.php:61
 msgid "Please join us on Friendica"
 msgstr ""
 
-#: ../../mod/invite.php:69
+#: ../../mod/invite.php:71
 #, php-format
 msgid "%s : Message delivery failed."
 msgstr ""
 
-#: ../../mod/invite.php:73
+#: ../../mod/invite.php:75
 #, php-format
 msgid "%d message sent."
 msgid_plural "%d messages sent."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/invite.php:92
+#: ../../mod/invite.php:94
 msgid "You have no more invitations available"
 msgstr ""
 
-#: ../../mod/invite.php:100
+#: ../../mod/invite.php:102
 #, php-format
 msgid ""
 "Visit %s for a list of public sites that you can join. Friendica members on "
@@ -4879,14 +4878,14 @@ msgid ""
 "other social networks."
 msgstr ""
 
-#: ../../mod/invite.php:102
+#: ../../mod/invite.php:104
 #, php-format
 msgid ""
 "To accept this invitation, please visit and register at %s or any other "
 "public Friendica website."
 msgstr ""
 
-#: ../../mod/invite.php:103
+#: ../../mod/invite.php:105
 #, php-format
 msgid ""
 "Friendica sites all inter-connect to create a huge privacy-enhanced social "
@@ -4895,36 +4894,36 @@ msgid ""
 "sites you can join."
 msgstr ""
 
-#: ../../mod/invite.php:106
+#: ../../mod/invite.php:108
 msgid ""
 "Our apologies. This system is not currently configured to connect with other "
 "public sites or invite members."
 msgstr ""
 
-#: ../../mod/invite.php:111
+#: ../../mod/invite.php:113
 msgid "Send invitations"
 msgstr ""
 
-#: ../../mod/invite.php:112
+#: ../../mod/invite.php:114
 msgid "Enter email addresses, one per line:"
 msgstr ""
 
-#: ../../mod/invite.php:114
+#: ../../mod/invite.php:116
 msgid ""
 "You are cordially invited to join me and other close friends on Friendica - "
 "and help us to create a better social web."
 msgstr ""
 
-#: ../../mod/invite.php:116
+#: ../../mod/invite.php:118
 msgid "You will need to supply this invitation code: $invite_code"
 msgstr ""
 
-#: ../../mod/invite.php:116
+#: ../../mod/invite.php:118
 msgid ""
 "Once you have registered, please connect with me via my profile page at:"
 msgstr ""
 
-#: ../../mod/invite.php:118
+#: ../../mod/invite.php:120
 msgid ""
 "For more information about the Friendica project and why we feel it is "
 "important, please visit http://friendica.com"
@@ -4965,7 +4964,7 @@ msgstr ""
 msgid "Unable to set contact photo."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:619
+#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:621
 #: ../../include/conversation.php:171
 #, php-format
 msgid "%1$s is now friends with %2$s"
@@ -5007,12 +5006,12 @@ msgstr ""
 msgid "Unable to update your contact profile details on our system"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:750
+#: ../../mod/dfrn_confirm.php:751
 #, php-format
 msgid "Connection accepted at %s"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:799
+#: ../../mod/dfrn_confirm.php:800
 #, php-format
 msgid "%1$s has joined %2$s"
 msgstr ""
@@ -5037,38 +5036,38 @@ msgstr ""
 msgid "Google+ Import Settings saved."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:523
+#: ../../addon/facebook/facebook.php:525
 #: ../../addon.old/facebook/facebook.php:523
 msgid "Facebook disabled"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:528
+#: ../../addon/facebook/facebook.php:530
 #: ../../addon.old/facebook/facebook.php:528
 msgid "Updating contacts"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:551 ../../addon/fbpost/fbpost.php:199
+#: ../../addon/facebook/facebook.php:553 ../../addon/fbpost/fbpost.php:203
 #: ../../addon.old/facebook/facebook.php:551
 #: ../../addon.old/fbpost/fbpost.php:192
 msgid "Facebook API key is missing."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:558
+#: ../../addon/facebook/facebook.php:560
 #: ../../addon.old/facebook/facebook.php:558
 msgid "Facebook Connect"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:564
+#: ../../addon/facebook/facebook.php:566
 #: ../../addon.old/facebook/facebook.php:564
 msgid "Install Facebook connector for this account."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:571
+#: ../../addon/facebook/facebook.php:573
 #: ../../addon.old/facebook/facebook.php:571
 msgid "Remove Facebook connector"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:576 ../../addon/fbpost/fbpost.php:224
+#: ../../addon/facebook/facebook.php:578 ../../addon/fbpost/fbpost.php:228
 #: ../../addon.old/facebook/facebook.php:576
 #: ../../addon.old/fbpost/fbpost.php:217
 msgid ""
@@ -5076,63 +5075,63 @@ msgid ""
 "changed.]"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:583 ../../addon/fbpost/fbpost.php:231
+#: ../../addon/facebook/facebook.php:585 ../../addon/fbpost/fbpost.php:235
 #: ../../addon.old/facebook/facebook.php:583
 #: ../../addon.old/fbpost/fbpost.php:224
 msgid "Post to Facebook by default"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:589
+#: ../../addon/facebook/facebook.php:591
 #: ../../addon.old/facebook/facebook.php:589
 msgid ""
 "Facebook friend linking has been disabled on this site. The following "
 "settings will have no effect."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:593
+#: ../../addon/facebook/facebook.php:595
 #: ../../addon.old/facebook/facebook.php:593
 msgid ""
 "Facebook friend linking has been disabled on this site. If you disable it, "
 "you will be unable to re-enable it."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:596
+#: ../../addon/facebook/facebook.php:598
 #: ../../addon.old/facebook/facebook.php:596
 msgid "Link all your Facebook friends and conversations on this website"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:598
+#: ../../addon/facebook/facebook.php:600
 #: ../../addon.old/facebook/facebook.php:598
 msgid ""
 "Facebook conversations consist of your <em>profile wall</em> and your friend "
 "<em>stream</em>."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:599
+#: ../../addon/facebook/facebook.php:601
 #: ../../addon.old/facebook/facebook.php:599
 msgid "On this website, your Facebook friend stream is only visible to you."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:600
+#: ../../addon/facebook/facebook.php:602
 #: ../../addon.old/facebook/facebook.php:600
 msgid ""
 "The following settings determine the privacy of your Facebook profile wall "
 "on this website."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:604
+#: ../../addon/facebook/facebook.php:606
 #: ../../addon.old/facebook/facebook.php:604
 msgid ""
 "On this website your Facebook profile wall conversations will only be "
 "visible to you"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:609
+#: ../../addon/facebook/facebook.php:611
 #: ../../addon.old/facebook/facebook.php:609
 msgid "Do not import your Facebook profile wall conversations"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:611
+#: ../../addon/facebook/facebook.php:613
 #: ../../addon.old/facebook/facebook.php:611
 msgid ""
 "If you choose to link conversations and leave both of these boxes unchecked, "
@@ -5141,28 +5140,40 @@ msgid ""
 "who may see the conversations."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:616
+#: ../../addon/facebook/facebook.php:618
 #: ../../addon.old/facebook/facebook.php:616
 msgid "Comma separated applications to ignore"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:700
+#: ../../addon/facebook/facebook.php:702
 #: ../../addon.old/facebook/facebook.php:700
 msgid "Problems with Facebook Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:729
+#: ../../addon/facebook/facebook.php:704
+#: ../../addon/facebook/facebook.php:1202 ../../addon/fbpost/fbpost.php:821
+#: ../../addon/public_server/public_server.php:62
+#: ../../addon/testdrive/testdrive.php:67
+#: ../../addon.old/facebook/facebook.php:702
+#: ../../addon.old/facebook/facebook.php:1200
+#: ../../addon.old/fbpost/fbpost.php:661
+#: ../../addon.old/public_server/public_server.php:62
+#: ../../addon.old/testdrive/testdrive.php:67
+msgid "Administrator"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:731
 #: ../../addon.old/facebook/facebook.php:729
 msgid "Facebook Connector Settings"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:744 ../../addon/fbpost/fbpost.php:302
+#: ../../addon/facebook/facebook.php:746 ../../addon/fbpost/fbpost.php:310
 #: ../../addon.old/facebook/facebook.php:744
 #: ../../addon.old/fbpost/fbpost.php:255
 msgid "Facebook API Key"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:754 ../../addon/fbpost/fbpost.php:309
+#: ../../addon/facebook/facebook.php:756 ../../addon/fbpost/fbpost.php:317
 #: ../../addon.old/facebook/facebook.php:754
 #: ../../addon.old/fbpost/fbpost.php:262
 msgid ""
@@ -5171,76 +5182,76 @@ msgid ""
 "using this form.<br><br>"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:759
+#: ../../addon/facebook/facebook.php:761
 #: ../../addon.old/facebook/facebook.php:759
 msgid ""
 "Error: the given API Key seems to be incorrect (the application access token "
 "could not be retrieved)."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:761
+#: ../../addon/facebook/facebook.php:763
 #: ../../addon.old/facebook/facebook.php:761
 msgid "The given API Key seems to work correctly."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:763
+#: ../../addon/facebook/facebook.php:765
 #: ../../addon.old/facebook/facebook.php:763
 msgid ""
 "The correctness of the API Key could not be detected. Something strange's "
 "going on."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:766 ../../addon/fbpost/fbpost.php:311
+#: ../../addon/facebook/facebook.php:768 ../../addon/fbpost/fbpost.php:319
 #: ../../addon.old/facebook/facebook.php:766
 #: ../../addon.old/fbpost/fbpost.php:264
 msgid "App-ID / API-Key"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:767 ../../addon/fbpost/fbpost.php:312
+#: ../../addon/facebook/facebook.php:769 ../../addon/fbpost/fbpost.php:320
 #: ../../addon.old/facebook/facebook.php:767
 #: ../../addon.old/fbpost/fbpost.php:265
 msgid "Application secret"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:768
+#: ../../addon/facebook/facebook.php:770
 #: ../../addon.old/facebook/facebook.php:768
 #, php-format
 msgid "Polling Interval in minutes (minimum %1$s minutes)"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:769
+#: ../../addon/facebook/facebook.php:771
 #: ../../addon.old/facebook/facebook.php:769
 msgid ""
 "Synchronize comments (no comments on Facebook are missed, at the cost of "
 "increased system load)"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:773
+#: ../../addon/facebook/facebook.php:775
 #: ../../addon.old/facebook/facebook.php:773
 msgid "Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:777
+#: ../../addon/facebook/facebook.php:779
 #: ../../addon.old/facebook/facebook.php:777
 msgid "Real-Time Updates are activated."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:778
+#: ../../addon/facebook/facebook.php:780
 #: ../../addon.old/facebook/facebook.php:778
 msgid "Deactivate Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:780
+#: ../../addon/facebook/facebook.php:782
 #: ../../addon.old/facebook/facebook.php:780
 msgid "Real-Time Updates not activated."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:780
+#: ../../addon/facebook/facebook.php:782
 #: ../../addon.old/facebook/facebook.php:780
 msgid "Activate Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:799 ../../addon/fbpost/fbpost.php:329
+#: ../../addon/facebook/facebook.php:801 ../../addon/fbpost/fbpost.php:337
 #: ../../addon/dav/friendica/layout.fnk.php:361
 #: ../../addon.old/facebook/facebook.php:799
 #: ../../addon.old/fbpost/fbpost.php:282
@@ -5248,13 +5259,13 @@ msgstr ""
 msgid "The new values have been saved."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:823 ../../addon/fbpost/fbpost.php:348
+#: ../../addon/facebook/facebook.php:825 ../../addon/fbpost/fbpost.php:356
 #: ../../addon.old/facebook/facebook.php:823
 #: ../../addon.old/fbpost/fbpost.php:301
 msgid "Post to Facebook"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:921 ../../addon/fbpost/fbpost.php:471
+#: ../../addon/facebook/facebook.php:923 ../../addon/fbpost/fbpost.php:487
 #: ../../addon.old/facebook/facebook.php:921
 #: ../../addon.old/fbpost/fbpost.php:399
 msgid ""
@@ -5262,31 +5273,31 @@ msgid ""
 "conflict."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1149 ../../addon/fbpost/fbpost.php:750
+#: ../../addon/facebook/facebook.php:1151 ../../addon/fbpost/fbpost.php:766
 #: ../../addon.old/facebook/facebook.php:1149
 #: ../../addon.old/fbpost/fbpost.php:610
 msgid "View on Friendica"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1182 ../../addon/fbpost/fbpost.php:787
+#: ../../addon/facebook/facebook.php:1184 ../../addon/fbpost/fbpost.php:803
 #: ../../addon.old/facebook/facebook.php:1182
 #: ../../addon.old/fbpost/fbpost.php:643
 msgid "Facebook post failed. Queued for retry."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1222 ../../addon/fbpost/fbpost.php:827
+#: ../../addon/facebook/facebook.php:1224 ../../addon/fbpost/fbpost.php:843
 #: ../../addon.old/facebook/facebook.php:1222
 #: ../../addon.old/fbpost/fbpost.php:683
 msgid "Your Facebook connection became invalid. Please Re-authenticate."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1223 ../../addon/fbpost/fbpost.php:828
+#: ../../addon/facebook/facebook.php:1225 ../../addon/fbpost/fbpost.php:844
 #: ../../addon.old/facebook/facebook.php:1223
 #: ../../addon.old/fbpost/fbpost.php:684
 msgid "Facebook connection became invalid"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1224 ../../addon/fbpost/fbpost.php:829
+#: ../../addon/facebook/facebook.php:1226 ../../addon/fbpost/fbpost.php:845
 #: ../../addon.old/facebook/facebook.php:1224
 #: ../../addon.old/fbpost/fbpost.php:685
 #, php-format
@@ -5313,60 +5324,64 @@ msgstr ""
 msgid "Automatically follow any StatusNet followers/mentioners"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:343
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:351
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:260
 msgid "Lifetime of the cache (in hours)"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:348
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:356
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:265
 msgid "Cache Statistics"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:351
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:359
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:268
 msgid "Number of items"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:353
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:361
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:270
 msgid "Size of the cache"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:355
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:363
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:272
 msgid "Delete the whole cache"
 msgstr ""
 
-#: ../../addon/fbpost/fbpost.php:179 ../../addon.old/fbpost/fbpost.php:172
+#: ../../addon/fbpost/fbpost.php:183 ../../addon.old/fbpost/fbpost.php:172
 msgid "Facebook Post disabled"
 msgstr ""
 
-#: ../../addon/fbpost/fbpost.php:206 ../../addon.old/fbpost/fbpost.php:199
+#: ../../addon/fbpost/fbpost.php:210 ../../addon.old/fbpost/fbpost.php:199
 msgid "Facebook Post"
 msgstr ""
 
-#: ../../addon/fbpost/fbpost.php:212 ../../addon.old/fbpost/fbpost.php:205
+#: ../../addon/fbpost/fbpost.php:216 ../../addon.old/fbpost/fbpost.php:205
 msgid "Install Facebook Post connector for this account."
 msgstr ""
 
-#: ../../addon/fbpost/fbpost.php:219 ../../addon.old/fbpost/fbpost.php:212
+#: ../../addon/fbpost/fbpost.php:223 ../../addon.old/fbpost/fbpost.php:212
 msgid "Remove Facebook Post connector"
 msgstr ""
 
-#: ../../addon/fbpost/fbpost.php:235
+#: ../../addon/fbpost/fbpost.php:239
 msgid "Suppress \"View on friendica\""
 msgstr ""
 
-#: ../../addon/fbpost/fbpost.php:245
+#: ../../addon/fbpost/fbpost.php:243
+msgid "Mirror wall posts from facebook to friendica."
+msgstr ""
+
+#: ../../addon/fbpost/fbpost.php:253
 msgid "Post to page/group:"
 msgstr ""
 
-#: ../../addon/fbpost/fbpost.php:287 ../../addon.old/fbpost/fbpost.php:240
+#: ../../addon/fbpost/fbpost.php:295 ../../addon.old/fbpost/fbpost.php:240
 msgid "Facebook Post Settings"
 msgstr ""
 
-#: ../../addon/fbpost/fbpost.php:367
+#: ../../addon/fbpost/fbpost.php:375
 #, php-format
 msgid "%s:"
 msgstr ""
@@ -5719,11 +5734,8 @@ msgid "Forum Directory"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:28
-#: ../../addon/communityhome/communityhome.php:34
-#: ../../addon/communityhome/twillingham/communityhome.php:28
-#: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:976
-#: ../../addon.old/communityhome/communityhome.php:28
+#: ../../addon/communityhome/communityhome.php:34 ../../include/nav.php:64
+#: ../../boot.php:1016 ../../addon.old/communityhome/communityhome.php:28
 #: ../../addon.old/communityhome/communityhome.php:34
 #: ../../addon.old/communityhome/twillingham/communityhome.php:28
 #: ../../addon.old/communityhome/twillingham/communityhome.php:34
@@ -5731,38 +5743,35 @@ msgid "Login"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:29
-#: ../../addon/communityhome/twillingham/communityhome.php:29
 #: ../../addon.old/communityhome/communityhome.php:29
 #: ../../addon.old/communityhome/twillingham/communityhome.php:29
 msgid "OpenID"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:38
-#: ../../addon/communityhome/twillingham/communityhome.php:38
+#: ../../addon/communityhome/communityhome.php:39
 #: ../../addon.old/communityhome/communityhome.php:38
 #: ../../addon.old/communityhome/twillingham/communityhome.php:38
 msgid "Latest users"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:82
-#: ../../addon/communityhome/twillingham/communityhome.php:81
+#: ../../addon/communityhome/communityhome.php:84
 #: ../../addon.old/communityhome/communityhome.php:81
 #: ../../addon.old/communityhome/twillingham/communityhome.php:81
 msgid "Most active users"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:99
+#: ../../addon/communityhome/communityhome.php:102
 #: ../../addon.old/communityhome/communityhome.php:98
 msgid "Latest photos"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:136
+#: ../../addon/communityhome/communityhome.php:141
 #: ../../addon.old/communityhome/communityhome.php:133
 msgid "Latest likes"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:158
-#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1496
+#: ../../addon/communityhome/communityhome.php:163
+#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1496
 #: ../../include/conversation.php:117 ../../include/conversation.php:245
 #: ../../addon.old/communityhome/communityhome.php:155
 msgid "event"
@@ -6331,7 +6340,7 @@ msgstr ""
 
 #: ../../addon/dav/friendica/main.php:279
 #: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:468
-#: ../../include/enotify.php:28 ../../include/notifier.php:781
+#: ../../include/enotify.php:28 ../../include/notifier.php:785
 #: ../../addon.old/dav/friendica/main.php:279
 #: ../../addon.old/dav/friendica/main.php:280
 msgid "noreply"
@@ -6910,24 +6919,24 @@ msgstr ""
 msgid "Quick Comment settings saved."
 msgstr ""
 
-#: ../../addon/openstreetmap/openstreetmap.php:71
+#: ../../addon/openstreetmap/openstreetmap.php:95
 #: ../../addon.old/openstreetmap/openstreetmap.php:71
 msgid "Tile Server URL"
 msgstr ""
 
-#: ../../addon/openstreetmap/openstreetmap.php:71
+#: ../../addon/openstreetmap/openstreetmap.php:95
 #: ../../addon.old/openstreetmap/openstreetmap.php:71
 msgid ""
 "A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank"
 "\">public tile servers</a>"
 msgstr ""
 
-#: ../../addon/openstreetmap/openstreetmap.php:72
+#: ../../addon/openstreetmap/openstreetmap.php:96
 #: ../../addon.old/openstreetmap/openstreetmap.php:72
 msgid "Default zoom"
 msgstr ""
 
-#: ../../addon/openstreetmap/openstreetmap.php:72
+#: ../../addon/openstreetmap/openstreetmap.php:96
 #: ../../addon.old/openstreetmap/openstreetmap.php:72
 msgid "The default zoom level. (1:world, 18:highest)"
 msgstr ""
@@ -7269,39 +7278,39 @@ msgstr ""
 msgid "View Source"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:134
+#: ../../addon/statusnet/statusnet.php:138
 #: ../../addon.old/statusnet/statusnet.php:134
 msgid "Post to StatusNet"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:176
+#: ../../addon/statusnet/statusnet.php:180
 #: ../../addon.old/statusnet/statusnet.php:176
 msgid ""
 "Please contact your site administrator.<br />The provided API URL is not "
 "valid."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:204
+#: ../../addon/statusnet/statusnet.php:208
 #: ../../addon.old/statusnet/statusnet.php:204
 msgid "We could not contact the StatusNet API with the Path you entered."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:232
+#: ../../addon/statusnet/statusnet.php:238
 #: ../../addon.old/statusnet/statusnet.php:232
 msgid "StatusNet settings updated."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:257
+#: ../../addon/statusnet/statusnet.php:269
 #: ../../addon.old/statusnet/statusnet.php:257
 msgid "StatusNet Posting Settings"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:271
+#: ../../addon/statusnet/statusnet.php:283
 #: ../../addon.old/statusnet/statusnet.php:271
 msgid "Globally Available StatusNet OAuthKeys"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:272
+#: ../../addon/statusnet/statusnet.php:284
 #: ../../addon.old/statusnet/statusnet.php:272
 msgid ""
 "There are preconfigured OAuth key pairs for some StatusNet servers "
@@ -7309,12 +7318,12 @@ msgid ""
 "not feel free to connect to any other StatusNet instance (see below)."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:280
+#: ../../addon/statusnet/statusnet.php:292
 #: ../../addon.old/statusnet/statusnet.php:280
 msgid "Provide your own OAuth Credentials"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:281
+#: ../../addon/statusnet/statusnet.php:293
 #: ../../addon.old/statusnet/statusnet.php:281
 msgid ""
 "No consumer key pair for StatusNet found. Register your Friendica Account as "
@@ -7324,22 +7333,22 @@ msgid ""
 "installation at your favorited StatusNet installation."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:283
+#: ../../addon/statusnet/statusnet.php:295
 #: ../../addon.old/statusnet/statusnet.php:283
 msgid "OAuth Consumer Key"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:286
+#: ../../addon/statusnet/statusnet.php:298
 #: ../../addon.old/statusnet/statusnet.php:286
 msgid "OAuth Consumer Secret"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:289
+#: ../../addon/statusnet/statusnet.php:301
 #: ../../addon.old/statusnet/statusnet.php:289
 msgid "Base API Path (remember the trailing /)"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:310
+#: ../../addon/statusnet/statusnet.php:322
 #: ../../addon.old/statusnet/statusnet.php:310
 msgid ""
 "To connect to your StatusNet account click the button below to get a "
@@ -7348,38 +7357,38 @@ msgid ""
 "to StatusNet."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:311
+#: ../../addon/statusnet/statusnet.php:323
 #: ../../addon.old/statusnet/statusnet.php:311
 msgid "Log in with StatusNet"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:313
+#: ../../addon/statusnet/statusnet.php:325
 #: ../../addon.old/statusnet/statusnet.php:313
 msgid "Copy the security code from StatusNet here"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:319
+#: ../../addon/statusnet/statusnet.php:331
 #: ../../addon.old/statusnet/statusnet.php:319
 msgid "Cancel Connection Process"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:321
+#: ../../addon/statusnet/statusnet.php:333
 #: ../../addon.old/statusnet/statusnet.php:321
 msgid "Current StatusNet API is"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:322
+#: ../../addon/statusnet/statusnet.php:334
 #: ../../addon.old/statusnet/statusnet.php:322
 msgid "Cancel StatusNet Connection"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:333 ../../addon/twitter/twitter.php:189
+#: ../../addon/statusnet/statusnet.php:345 ../../addon/twitter/twitter.php:200
 #: ../../addon.old/statusnet/statusnet.php:333
 #: ../../addon.old/twitter/twitter.php:189
 msgid "Currently connected to: "
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:334
+#: ../../addon/statusnet/statusnet.php:346
 #: ../../addon.old/statusnet/statusnet.php:334
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
@@ -7387,7 +7396,7 @@ msgid ""
 "for every posting separately in the posting options when writing the entry."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:336
+#: ../../addon/statusnet/statusnet.php:348
 #: ../../addon.old/statusnet/statusnet.php:336
 msgid ""
 "<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
@@ -7396,28 +7405,37 @@ msgid ""
 "informing the visitor that the access to your profile has been restricted."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:339
+#: ../../addon/statusnet/statusnet.php:351
 #: ../../addon.old/statusnet/statusnet.php:339
 msgid "Allow posting to StatusNet"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:342
+#: ../../addon/statusnet/statusnet.php:354
 #: ../../addon.old/statusnet/statusnet.php:342
 msgid "Send public postings to StatusNet by default"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:345
+#: ../../addon/statusnet/statusnet.php:358
+msgid ""
+"Mirror all posts from statusnet that are no replies or repeated messages"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:362
+msgid "Shortening method that optimizes the post"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:366
 #: ../../addon.old/statusnet/statusnet.php:345
 msgid "Send linked #-tags and @-names to StatusNet"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:350 ../../addon/twitter/twitter.php:206
+#: ../../addon/statusnet/statusnet.php:371 ../../addon/twitter/twitter.php:226
 #: ../../addon.old/statusnet/statusnet.php:350
 #: ../../addon.old/twitter/twitter.php:206
 msgid "Clear OAuth configuration"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:695
+#: ../../addon/statusnet/statusnet.php:745
 #: ../../addon.old/statusnet/statusnet.php:568
 msgid "API URL"
 msgstr ""
@@ -7601,25 +7619,25 @@ msgstr ""
 msgid "Asynchronous tracking"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:73 ../../addon.old/twitter/twitter.php:73
+#: ../../addon/twitter/twitter.php:77 ../../addon.old/twitter/twitter.php:73
 msgid "Post to Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:122 ../../addon.old/twitter/twitter.php:122
+#: ../../addon/twitter/twitter.php:129 ../../addon.old/twitter/twitter.php:122
 msgid "Twitter settings updated."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:146 ../../addon.old/twitter/twitter.php:146
+#: ../../addon/twitter/twitter.php:157 ../../addon.old/twitter/twitter.php:146
 msgid "Twitter Posting Settings"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:153 ../../addon.old/twitter/twitter.php:153
+#: ../../addon/twitter/twitter.php:164 ../../addon.old/twitter/twitter.php:153
 msgid ""
 "No consumer key pair for Twitter found. Please contact your site "
 "administrator."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:172 ../../addon.old/twitter/twitter.php:172
+#: ../../addon/twitter/twitter.php:183 ../../addon.old/twitter/twitter.php:172
 msgid ""
 "At this Friendica instance the Twitter plugin was enabled but you have not "
 "yet connected your account to your Twitter account. To do so click the "
@@ -7628,22 +7646,22 @@ msgid ""
 "be posted to Twitter."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:173 ../../addon.old/twitter/twitter.php:173
+#: ../../addon/twitter/twitter.php:184 ../../addon.old/twitter/twitter.php:173
 msgid "Log in with Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:175 ../../addon.old/twitter/twitter.php:175
+#: ../../addon/twitter/twitter.php:186 ../../addon.old/twitter/twitter.php:175
 msgid "Copy the PIN from Twitter here"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:190 ../../addon.old/twitter/twitter.php:190
+#: ../../addon/twitter/twitter.php:201 ../../addon.old/twitter/twitter.php:190
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated Twitter account. You can choose to do so by default (here) or for "
 "every posting separately in the posting options when writing the entry."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:192 ../../addon.old/twitter/twitter.php:192
+#: ../../addon/twitter/twitter.php:203 ../../addon.old/twitter/twitter.php:192
 msgid ""
 "<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
 "details from unknown viewers?</em>) the link potentially included in public "
@@ -7651,23 +7669,31 @@ msgid ""
 "the visitor that the access to your profile has been restricted."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:195 ../../addon.old/twitter/twitter.php:195
+#: ../../addon/twitter/twitter.php:206 ../../addon.old/twitter/twitter.php:195
 msgid "Allow posting to Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:198 ../../addon.old/twitter/twitter.php:198
+#: ../../addon/twitter/twitter.php:209 ../../addon.old/twitter/twitter.php:198
 msgid "Send public postings to Twitter by default"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:201 ../../addon.old/twitter/twitter.php:201
+#: ../../addon/twitter/twitter.php:213
+msgid "Mirror all posts from twitter that are no replies or retweets"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:217
+msgid "Shortening method that optimizes the tweet"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:221 ../../addon.old/twitter/twitter.php:201
 msgid "Send linked #-tags and @-names to Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:517 ../../addon.old/twitter/twitter.php:396
+#: ../../addon/twitter/twitter.php:556 ../../addon.old/twitter/twitter.php:396
 msgid "Consumer key"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:518 ../../addon.old/twitter/twitter.php:397
+#: ../../addon/twitter/twitter.php:557 ../../addon.old/twitter/twitter.php:397
 msgid "Consumer secret"
 msgstr ""
 
@@ -7805,137 +7831,137 @@ msgstr ""
 msgid "Color scheme"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:49
+#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49
 #: ../../include/nav.php:116
 msgid "Your posts and conversations"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:89 ../../include/nav.php:50
+#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:50
 msgid "Your profile page"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:90
+#: ../../view/theme/diabook/theme.php:89
 msgid "Your contacts"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:51
+#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51
 msgid "Your photos"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:52
+#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52
 msgid "Your events"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:93 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53
 msgid "Personal notes"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:93 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53
 msgid "Your personal photos"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:95
-#: ../../view/theme/diabook/theme.php:538
-#: ../../view/theme/diabook/theme.php:633
+#: ../../view/theme/diabook/theme.php:94
+#: ../../view/theme/diabook/theme.php:537
+#: ../../view/theme/diabook/theme.php:632
 #: ../../view/theme/diabook/config.php:163
 msgid "Community Pages"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:385
-#: ../../view/theme/diabook/theme.php:635
+#: ../../view/theme/diabook/theme.php:384
+#: ../../view/theme/diabook/theme.php:634
 #: ../../view/theme/diabook/config.php:165
 msgid "Community Profiles"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:406
-#: ../../view/theme/diabook/theme.php:640
+#: ../../view/theme/diabook/theme.php:405
+#: ../../view/theme/diabook/theme.php:639
 #: ../../view/theme/diabook/config.php:170
 msgid "Last users"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:435
-#: ../../view/theme/diabook/theme.php:642
+#: ../../view/theme/diabook/theme.php:434
+#: ../../view/theme/diabook/theme.php:641
 #: ../../view/theme/diabook/config.php:172
 msgid "Last likes"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:480
-#: ../../view/theme/diabook/theme.php:641
+#: ../../view/theme/diabook/theme.php:479
+#: ../../view/theme/diabook/theme.php:640
 #: ../../view/theme/diabook/config.php:171
 msgid "Last photos"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:517
-#: ../../view/theme/diabook/theme.php:638
+#: ../../view/theme/diabook/theme.php:516
+#: ../../view/theme/diabook/theme.php:637
 #: ../../view/theme/diabook/config.php:168
 msgid "Find Friends"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:518
+#: ../../view/theme/diabook/theme.php:517
 msgid "Local Directory"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:520 ../../include/contact_widgets.php:35
+#: ../../view/theme/diabook/theme.php:519 ../../include/contact_widgets.php:35
 msgid "Similar Interests"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:522 ../../include/contact_widgets.php:37
+#: ../../view/theme/diabook/theme.php:521 ../../include/contact_widgets.php:37
 msgid "Invite Friends"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:573
-#: ../../view/theme/diabook/theme.php:634
+#: ../../view/theme/diabook/theme.php:572
+#: ../../view/theme/diabook/theme.php:633
 #: ../../view/theme/diabook/config.php:164
 msgid "Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:578
+#: ../../view/theme/diabook/theme.php:577
 msgid "Set zoomfactor for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:579
+#: ../../view/theme/diabook/theme.php:578
 #: ../../view/theme/diabook/config.php:161
 msgid "Set longitude (X) for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:580
+#: ../../view/theme/diabook/theme.php:579
 #: ../../view/theme/diabook/config.php:162
 msgid "Set latitude (Y) for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:593
-#: ../../view/theme/diabook/theme.php:636
+#: ../../view/theme/diabook/theme.php:592
+#: ../../view/theme/diabook/theme.php:635
 #: ../../view/theme/diabook/config.php:166
 msgid "Help or @NewHere ?"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:600
-#: ../../view/theme/diabook/theme.php:637
+#: ../../view/theme/diabook/theme.php:599
+#: ../../view/theme/diabook/theme.php:636
 #: ../../view/theme/diabook/config.php:167
 msgid "Connect Services"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:607
-#: ../../view/theme/diabook/theme.php:639
+#: ../../view/theme/diabook/theme.php:606
+#: ../../view/theme/diabook/theme.php:638
 msgid "Last Tweets"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:610
+#: ../../view/theme/diabook/theme.php:609
 #: ../../view/theme/diabook/config.php:159
 msgid "Set twitter search term"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:630
+#: ../../view/theme/diabook/theme.php:629
 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:313
 msgid "don't show"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:630
+#: ../../view/theme/diabook/theme.php:629
 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:312
 msgid "show"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:631
+#: ../../view/theme/diabook/theme.php:630
 msgid "Show/hide boxes at right-hand column:"
 msgstr ""
 
@@ -8257,8 +8283,8 @@ msgstr ""
 msgid "Sex Addict"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42 ../../include/user.php:278
-#: ../../include/user.php:282
+#: ../../include/profile_selectors.php:42 ../../include/user.php:279
+#: ../../include/user.php:283
 msgid "Friends"
 msgstr ""
 
@@ -8354,7 +8380,7 @@ msgstr ""
 msgid "Finishes:"
 msgstr ""
 
-#: ../../include/delivery.php:457 ../../include/notifier.php:771
+#: ../../include/delivery.php:457 ../../include/notifier.php:775
 msgid "(no subject)"
 msgstr ""
 
@@ -8581,7 +8607,7 @@ msgstr ""
 msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/text.php:1278 ../../include/user.php:236
+#: ../../include/text.php:1278 ../../include/user.php:237
 msgid "default"
 msgstr ""
 
@@ -8601,11 +8627,11 @@ msgstr ""
 msgid "Item filed"
 msgstr ""
 
-#: ../../include/diaspora.php:702
+#: ../../include/diaspora.php:704
 msgid "Sharing notification from Diaspora network"
 msgstr ""
 
-#: ../../include/diaspora.php:2239
+#: ../../include/diaspora.php:2248
 msgid "Attachments:"
 msgstr ""
 
@@ -8692,7 +8718,7 @@ msgstr ""
 msgid "Contacts not in any group"
 msgstr ""
 
-#: ../../include/nav.php:46 ../../boot.php:975
+#: ../../include/nav.php:46 ../../boot.php:1015
 msgid "Logout"
 msgstr ""
 
@@ -8700,7 +8726,7 @@ msgstr ""
 msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:49 ../../boot.php:1767
+#: ../../include/nav.php:49 ../../boot.php:1812
 msgid "Status"
 msgstr ""
 
@@ -8792,7 +8818,7 @@ msgstr ""
 msgid "Delegations"
 msgstr ""
 
-#: ../../include/nav.php:142 ../../boot.php:1272
+#: ../../include/nav.php:142 ../../boot.php:1318
 msgid "Profiles"
 msgstr ""
 
@@ -8952,7 +8978,7 @@ msgstr ""
 msgid "Happy Birthday %s"
 msgstr ""
 
-#: ../../include/bbcode.php:210 ../../include/bbcode.php:491
+#: ../../include/bbcode.php:210 ../../include/bbcode.php:505
 msgid "Image/photo"
 msgstr ""
 
@@ -8963,11 +8989,11 @@ msgid ""
 "href=\"%s\" target=\"external-link\">post</a>:</span>"
 msgstr ""
 
-#: ../../include/bbcode.php:456 ../../include/bbcode.php:476
+#: ../../include/bbcode.php:470 ../../include/bbcode.php:490
 msgid "$1 wrote:"
 msgstr ""
 
-#: ../../include/bbcode.php:496 ../../include/bbcode.php:497
+#: ../../include/bbcode.php:510 ../../include/bbcode.php:511
 msgid "Encrypted content"
 msgstr ""
 
@@ -9384,71 +9410,71 @@ msgstr ""
 msgid "Archives"
 msgstr ""
 
-#: ../../include/user.php:38
+#: ../../include/user.php:39
 msgid "An invitation is required."
 msgstr ""
 
-#: ../../include/user.php:43
+#: ../../include/user.php:44
 msgid "Invitation could not be verified."
 msgstr ""
 
-#: ../../include/user.php:51
+#: ../../include/user.php:52
 msgid "Invalid OpenID url"
 msgstr ""
 
-#: ../../include/user.php:66
+#: ../../include/user.php:67
 msgid "Please enter the required information."
 msgstr ""
 
-#: ../../include/user.php:80
+#: ../../include/user.php:81
 msgid "Please use a shorter name."
 msgstr ""
 
-#: ../../include/user.php:82
+#: ../../include/user.php:83
 msgid "Name too short."
 msgstr ""
 
-#: ../../include/user.php:97
+#: ../../include/user.php:98
 msgid "That doesn't appear to be your full (First Last) name."
 msgstr ""
 
-#: ../../include/user.php:102
+#: ../../include/user.php:103
 msgid "Your email domain is not among those allowed on this site."
 msgstr ""
 
-#: ../../include/user.php:105
+#: ../../include/user.php:106
 msgid "Not a valid email address."
 msgstr ""
 
-#: ../../include/user.php:115
+#: ../../include/user.php:116
 msgid "Cannot use that email."
 msgstr ""
 
-#: ../../include/user.php:121
+#: ../../include/user.php:122
 msgid ""
 "Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
 "must also begin with a letter."
 msgstr ""
 
-#: ../../include/user.php:127 ../../include/user.php:225
+#: ../../include/user.php:128 ../../include/user.php:226
 msgid "Nickname is already registered. Please choose another."
 msgstr ""
 
-#: ../../include/user.php:137
+#: ../../include/user.php:138
 msgid ""
 "Nickname was once registered here and may not be re-used. Please choose "
 "another."
 msgstr ""
 
-#: ../../include/user.php:153
+#: ../../include/user.php:154
 msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr ""
 
-#: ../../include/user.php:211
+#: ../../include/user.php:212
 msgid "An error occurred during registration. Please try again."
 msgstr ""
 
-#: ../../include/user.php:246
+#: ../../include/user.php:247
 msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 
@@ -9519,11 +9545,11 @@ msgstr ""
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 
-#: ../../include/conversation.php:620 ../../object/Item.php:243
+#: ../../include/conversation.php:620 ../../object/Item.php:249
 msgid "Categories:"
 msgstr ""
 
-#: ../../include/conversation.php:621 ../../object/Item.php:244
+#: ../../include/conversation.php:621 ../../object/Item.php:250
 msgid "Filed under:"
 msgstr ""
 
@@ -9549,62 +9575,60 @@ msgstr ""
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/conversation.php:884
-msgid "like this"
+#: ../../include/conversation.php:883
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this"
 msgstr ""
 
-#: ../../include/conversation.php:888
-msgid "don't like this"
+#: ../../include/conversation.php:886
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this"
 msgstr ""
 
-#: ../../include/conversation.php:895
-msgid "people"
-msgstr ""
-
-#: ../../include/conversation.php:905
+#: ../../include/conversation.php:900
 msgid "and"
 msgstr ""
 
-#: ../../include/conversation.php:911
+#: ../../include/conversation.php:906
 #, php-format
 msgid ", and %d other people"
 msgstr ""
 
-#: ../../include/conversation.php:913
+#: ../../include/conversation.php:908
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../include/conversation.php:913
+#: ../../include/conversation.php:908
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:940 ../../include/conversation.php:958
+#: ../../include/conversation.php:935 ../../include/conversation.php:953
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../include/conversation.php:942 ../../include/conversation.php:960
+#: ../../include/conversation.php:937 ../../include/conversation.php:955
 msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:943 ../../include/conversation.php:961
+#: ../../include/conversation.php:938 ../../include/conversation.php:956
 msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:944 ../../include/conversation.php:962
+#: ../../include/conversation.php:939 ../../include/conversation.php:957
 msgid "Tag term:"
 msgstr ""
 
-#: ../../include/conversation.php:946 ../../include/conversation.php:964
+#: ../../include/conversation.php:941 ../../include/conversation.php:959
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:947
+#: ../../include/conversation.php:942
 msgid "Delete item(s)?"
 msgstr ""
 
-#: ../../include/conversation.php:1026
+#: ../../include/conversation.php:1021
 msgid "permissions"
 msgstr ""
 
@@ -9620,133 +9644,133 @@ msgstr ""
 msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../boot.php:634
+#: ../../boot.php:640
 msgid "Delete this item?"
 msgstr ""
 
-#: ../../boot.php:637
+#: ../../boot.php:643
 msgid "show fewer"
 msgstr ""
 
-#: ../../boot.php:847
+#: ../../boot.php:878
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:849
+#: ../../boot.php:880
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:950
+#: ../../boot.php:990
 msgid "Create a New Account"
 msgstr ""
 
-#: ../../boot.php:978
+#: ../../boot.php:1018
 msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../boot.php:979
+#: ../../boot.php:1019
 msgid "Password: "
 msgstr ""
 
-#: ../../boot.php:980
+#: ../../boot.php:1020
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:983
+#: ../../boot.php:1023
 msgid "Or login using OpenID: "
 msgstr ""
 
-#: ../../boot.php:989
+#: ../../boot.php:1029
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:992
+#: ../../boot.php:1032
 msgid "Website Terms of Service"
 msgstr ""
 
-#: ../../boot.php:993
+#: ../../boot.php:1033
 msgid "terms of service"
 msgstr ""
 
-#: ../../boot.php:995
+#: ../../boot.php:1035
 msgid "Website Privacy Policy"
 msgstr ""
 
-#: ../../boot.php:996
+#: ../../boot.php:1036
 msgid "privacy policy"
 msgstr ""
 
-#: ../../boot.php:1121
+#: ../../boot.php:1165
 msgid "Requested account is not available."
 msgstr ""
 
-#: ../../boot.php:1198
+#: ../../boot.php:1244
 msgid "Edit profile"
 msgstr ""
 
-#: ../../boot.php:1264
+#: ../../boot.php:1310
 msgid "Message"
 msgstr ""
 
-#: ../../boot.php:1272
+#: ../../boot.php:1318
 msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../boot.php:1395 ../../boot.php:1481
+#: ../../boot.php:1440 ../../boot.php:1526
 msgid "g A l F d"
 msgstr ""
 
-#: ../../boot.php:1396 ../../boot.php:1482
+#: ../../boot.php:1441 ../../boot.php:1527
 msgid "F d"
 msgstr ""
 
-#: ../../boot.php:1441 ../../boot.php:1522
+#: ../../boot.php:1486 ../../boot.php:1567
 msgid "[today]"
 msgstr ""
 
-#: ../../boot.php:1453
+#: ../../boot.php:1498
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../boot.php:1454
+#: ../../boot.php:1499
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:1515
+#: ../../boot.php:1560
 msgid "[No description]"
 msgstr ""
 
-#: ../../boot.php:1533
+#: ../../boot.php:1578
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../boot.php:1534
+#: ../../boot.php:1579
 msgid "Events this week:"
 msgstr ""
 
-#: ../../boot.php:1770
+#: ../../boot.php:1815
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../boot.php:1777
+#: ../../boot.php:1822
 msgid "Profile Details"
 msgstr ""
 
-#: ../../boot.php:1794
+#: ../../boot.php:1839
 msgid "Events and Calendar"
 msgstr ""
 
-#: ../../boot.php:1801
+#: ../../boot.php:1846
 msgid "Only You Can See This"
 msgstr ""
 
-#: ../../object/Item.php:255
+#: ../../object/Item.php:261
 msgid "via"
 msgstr ""
 
-#: ../../index.php:398
+#: ../../index.php:399
 msgid "toggle mobile"
 msgstr ""
 
diff --git a/view/ca/smarty3/cmnt_received_eml.tpl b/view/ca/smarty3/cmnt_received_eml.tpl
index 082efc7458..c398c5231b 100644
--- a/view/ca/smarty3/cmnt_received_eml.tpl
+++ b/view/ca/smarty3/cmnt_received_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Apreciat/da {{$username}},
 
diff --git a/view/ca/smarty3/follow_notify_eml.tpl b/view/ca/smarty3/follow_notify_eml.tpl
index 6958365209..b908047417 100644
--- a/view/ca/smarty3/follow_notify_eml.tpl
+++ b/view/ca/smarty3/follow_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Apreciat/da {{$myname}},
 
diff --git a/view/ca/smarty3/friend_complete_eml.tpl b/view/ca/smarty3/friend_complete_eml.tpl
index 58bd14fea0..b26152d817 100644
--- a/view/ca/smarty3/friend_complete_eml.tpl
+++ b/view/ca/smarty3/friend_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Apreciat/da {{$username}},
 
diff --git a/view/ca/smarty3/htconfig.tpl b/view/ca/smarty3/htconfig.tpl
index c0fa7b3e09..cb92f25314 100644
--- a/view/ca/smarty3/htconfig.tpl
+++ b/view/ca/smarty3/htconfig.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?php
 
 // Set the following for your MySQL installation
diff --git a/view/ca/smarty3/intro_complete_eml.tpl b/view/ca/smarty3/intro_complete_eml.tpl
index bc26e3eb1b..2149c477af 100644
--- a/view/ca/smarty3/intro_complete_eml.tpl
+++ b/view/ca/smarty3/intro_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Apreciat/da {{$username}},
 
diff --git a/view/ca/smarty3/lostpass_eml.tpl b/view/ca/smarty3/lostpass_eml.tpl
index 469c429da4..55a14e1d59 100644
--- a/view/ca/smarty3/lostpass_eml.tpl
+++ b/view/ca/smarty3/lostpass_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Apreciat/da {{$username}},
 	
diff --git a/view/ca/smarty3/mail_received_html_body_eml.tpl b/view/ca/smarty3/mail_received_html_body_eml.tpl
index d3c9d7b853..198df8998b 100644
--- a/view/ca/smarty3/mail_received_html_body_eml.tpl
+++ b/view/ca/smarty3/mail_received_html_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
diff --git a/view/ca/smarty3/mail_received_text_body_eml.tpl b/view/ca/smarty3/mail_received_text_body_eml.tpl
index a3fa3cd381..3bd4a186f2 100644
--- a/view/ca/smarty3/mail_received_text_body_eml.tpl
+++ b/view/ca/smarty3/mail_received_text_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Has rebut un nou missatge privat de '{{$from}}' en {{$siteName}}.
 	
 {{$title}}
diff --git a/view/ca/smarty3/passchanged_eml.tpl b/view/ca/smarty3/passchanged_eml.tpl
index f0d62d9a1c..eddf2ed855 100644
--- a/view/ca/smarty3/passchanged_eml.tpl
+++ b/view/ca/smarty3/passchanged_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Apreciat/da {{$username}},
 
diff --git a/view/ca/smarty3/register_open_eml.tpl b/view/ca/smarty3/register_open_eml.tpl
index 7da9a2b888..b4e90991b9 100644
--- a/view/ca/smarty3/register_open_eml.tpl
+++ b/view/ca/smarty3/register_open_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Apreciat/da {{$username}},
 
diff --git a/view/ca/smarty3/register_verify_eml.tpl b/view/ca/smarty3/register_verify_eml.tpl
index 651e8eff78..d9cc94c1af 100644
--- a/view/ca/smarty3/register_verify_eml.tpl
+++ b/view/ca/smarty3/register_verify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 S'ha rebut la sol·licitud de registre d'un nou usuari en
 {{$sitename}} que requereix la teva aprovació.
diff --git a/view/ca/smarty3/request_notify_eml.tpl b/view/ca/smarty3/request_notify_eml.tpl
index 18dc3ef0d4..3e94e1a59a 100644
--- a/view/ca/smarty3/request_notify_eml.tpl
+++ b/view/ca/smarty3/request_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Apreciat/da {{$myname}},
 
diff --git a/view/ca/smarty3/wall_received_eml.tpl b/view/ca/smarty3/wall_received_eml.tpl
index cd75464416..faaaf1b198 100644
--- a/view/ca/smarty3/wall_received_eml.tpl
+++ b/view/ca/smarty3/wall_received_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Apreciat/da {{$username}},
 
diff --git a/view/contacts-template.tpl b/view/contacts-template.tpl
index 69e3202c37..ecb342bf44 100644
--- a/view/contacts-template.tpl
+++ b/view/contacts-template.tpl
@@ -14,8 +14,8 @@
 $tabs
 
 
-{{ for $contacts as $c }}
-	{{ inc contact_template.tpl with $contact=$c }}{{ endinc }}
+{{ for $contacts as $contact }}
+	{{ inc contact_template.tpl }}{{ endinc }}
 {{ endfor }}
 <div id="contact-edit-end"></div>
 
diff --git a/view/cs/messages.po b/view/cs/messages.po
index 727246eff8..68f7d35936 100644
--- a/view/cs/messages.po
+++ b/view/cs/messages.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the Friendica package.
 # 
 # Translators:
-# Michal Šupler <msupler@gmail.com>, 2011-2012.
+# Michal Šupler <msupler@gmail.com>, 2011-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2012-12-18 10:00-0800\n"
-"PO-Revision-Date: 2012-12-20 18:23+0000\n"
+"POT-Creation-Date: 2013-01-02 10:00-0800\n"
+"PO-Revision-Date: 2013-01-04 19:23+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"
@@ -41,8 +41,8 @@ msgstr "Aktualizace kontaktu selhala."
 #: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:995
 #: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:135
 #: ../../mod/notifications.php:66 ../../mod/contacts.php:147
-#: ../../mod/settings.php:91 ../../mod/settings.php:541
-#: ../../mod/settings.php:546 ../../mod/manage.php:90 ../../mod/network.php:6
+#: ../../mod/settings.php:91 ../../mod/settings.php:542
+#: ../../mod/settings.php:547 ../../mod/manage.php:90 ../../mod/network.php:6
 #: ../../mod/notes.php:20 ../../mod/uimport.php:23 ../../mod/wallmessage.php:9
 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
@@ -61,7 +61,7 @@ msgstr "Aktualizace kontaktu selhala."
 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:166
 #: ../../addon/fbpost/fbpost.php:172
 #: ../../addon/dav/friendica/layout.fnk.php:354
-#: ../../addon/tumblr/tumblr.php:34 ../../include/items.php:3977
+#: ../../addon/tumblr/tumblr.php:34 ../../include/items.php:3987
 #: ../../index.php:333 ../../addon.old/facebook/facebook.php:510
 #: ../../addon.old/facebook/facebook.php:516
 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165
@@ -94,8 +94,8 @@ msgstr "Prosím použijte <strong>ihned</strong> v prohlížeči tlačítko \"zp
 msgid "Return to contact editor"
 msgstr "Návrat k editoru kontaktu"
 
-#: ../../mod/crepair.php:148 ../../mod/settings.php:561
-#: ../../mod/settings.php:587 ../../mod/admin.php:695 ../../mod/admin.php:705
+#: ../../mod/crepair.php:148 ../../mod/settings.php:562
+#: ../../mod/settings.php:588 ../../mod/admin.php:731 ../../mod/admin.php:741
 msgid "Name"
 msgstr "Jméno"
 
@@ -132,18 +132,18 @@ msgid "New photo from this URL"
 msgstr "Nové foto z této URL adresy"
 
 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
-#: ../../mod/events.php:455 ../../mod/photos.php:1028
-#: ../../mod/photos.php:1100 ../../mod/photos.php:1363
-#: ../../mod/photos.php:1403 ../../mod/photos.php:1447
-#: ../../mod/photos.php:1519 ../../mod/install.php:246
-#: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199
-#: ../../mod/content.php:693 ../../mod/contacts.php:352
-#: ../../mod/settings.php:559 ../../mod/settings.php:669
-#: ../../mod/settings.php:738 ../../mod/settings.php:810
-#: ../../mod/settings.php:1017 ../../mod/group.php:85 ../../mod/mood.php:137
-#: ../../mod/message.php:301 ../../mod/message.php:487 ../../mod/admin.php:445
-#: ../../mod/admin.php:692 ../../mod/admin.php:829 ../../mod/admin.php:1028
-#: ../../mod/admin.php:1115 ../../mod/profiles.php:604
+#: ../../mod/events.php:466 ../../mod/photos.php:1028
+#: ../../mod/photos.php:1118 ../../mod/photos.php:1402
+#: ../../mod/photos.php:1442 ../../mod/photos.php:1486
+#: ../../mod/photos.php:1569 ../../mod/install.php:248
+#: ../../mod/install.php:286 ../../mod/localtime.php:45 ../../mod/poke.php:199
+#: ../../mod/content.php:710 ../../mod/contacts.php:352
+#: ../../mod/settings.php:560 ../../mod/settings.php:670
+#: ../../mod/settings.php:739 ../../mod/settings.php:811
+#: ../../mod/settings.php:1018 ../../mod/group.php:87 ../../mod/mood.php:137
+#: ../../mod/message.php:301 ../../mod/message.php:527 ../../mod/admin.php:461
+#: ../../mod/admin.php:728 ../../mod/admin.php:865 ../../mod/admin.php:1064
+#: ../../mod/admin.php:1151 ../../mod/profiles.php:604
 #: ../../mod/invite.php:119 ../../addon/fromgplus/fromgplus.php:44
 #: ../../addon/facebook/facebook.php:619
 #: ../../addon/snautofollow/snautofollow.php:64
@@ -152,8 +152,8 @@ msgstr "Nové foto z této URL adresy"
 #: ../../addon/page/page.php:211 ../../addon/planets/planets.php:158
 #: ../../addon/uhremotestorage/uhremotestorage.php:89
 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
-#: ../../addon/remote_permissions/remote_permissions.php:47
-#: ../../addon/remote_permissions/remote_permissions.php:195
+#: ../../addon/remote_permissions/remote_permissions.php:48
+#: ../../addon/remote_permissions/remote_permissions.php:196
 #: ../../addon/startpage/startpage.php:92
 #: ../../addon/geonames/geonames.php:187
 #: ../../addon/forumlist/forumlist.php:178
@@ -165,7 +165,7 @@ msgstr "Nové foto z této URL adresy"
 #: ../../addon/libravatar/libravatar.php:99
 #: ../../addon/libertree/libertree.php:90 ../../addon/altpager/altpager.php:91
 #: ../../addon/altpager/altpager.php:98 ../../addon/mathjax/mathjax.php:42
-#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:98
+#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:99
 #: ../../addon/gravatar/gravatar.php:95
 #: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93
 #: ../../addon/jappixmini/jappixmini.php:307
@@ -174,18 +174,18 @@ msgstr "Nové foto z této URL adresy"
 #: ../../addon/statusnet/statusnet.php:318
 #: ../../addon/statusnet/statusnet.php:325
 #: ../../addon/statusnet/statusnet.php:353
-#: ../../addon/statusnet/statusnet.php:700 ../../addon/tumblr/tumblr.php:233
+#: ../../addon/statusnet/statusnet.php:703 ../../addon/tumblr/tumblr.php:233
 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88
 #: ../../addon/wppost/wppost.php:110 ../../addon/showmore/showmore.php:48
 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180
-#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:506
+#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:515
 #: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77
 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103
 #: ../../view/theme/cleanzero/config.php:80
-#: ../../view/theme/diabook/theme.php:642
+#: ../../view/theme/diabook/theme.php:643
 #: ../../view/theme/diabook/config.php:152
 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70
-#: ../../object/Item.php:577 ../../addon.old/fromgplus/fromgplus.php:40
+#: ../../object/Item.php:603 ../../addon.old/fromgplus/fromgplus.php:40
 #: ../../addon.old/facebook/facebook.php:619
 #: ../../addon.old/snautofollow/snautofollow.php:64
 #: ../../addon.old/bg/bg.php:90 ../../addon.old/fbpost/fbpost.php:226
@@ -285,86 +285,87 @@ msgstr "l, F j"
 msgid "Edit event"
 msgstr "Editovat událost"
 
-#: ../../mod/events.php:323 ../../include/text.php:1190
+#: ../../mod/events.php:323 ../../include/text.php:1247
 msgid "link to source"
 msgstr "odkaz na zdroj"
 
-#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91
-#: ../../include/nav.php:52 ../../boot.php:1748
+#: ../../mod/events.php:358 ../../view/theme/diabook/theme.php:92
+#: ../../include/nav.php:52 ../../boot.php:1791
 msgid "Events"
 msgstr "Události"
 
-#: ../../mod/events.php:348
+#: ../../mod/events.php:359
 msgid "Create New Event"
 msgstr "Vytvořit novou událost"
 
-#: ../../mod/events.php:349 ../../addon/dav/friendica/layout.fnk.php:263
+#: ../../mod/events.php:360 ../../addon/dav/friendica/layout.fnk.php:263
 #: ../../addon.old/dav/friendica/layout.fnk.php:263
 msgid "Previous"
 msgstr "Předchozí"
 
-#: ../../mod/events.php:350 ../../mod/install.php:205
+#: ../../mod/events.php:361 ../../mod/install.php:207
 #: ../../addon/dav/friendica/layout.fnk.php:266
 #: ../../addon.old/dav/friendica/layout.fnk.php:266
 msgid "Next"
 msgstr "Dále"
 
-#: ../../mod/events.php:423
+#: ../../mod/events.php:434
 msgid "hour:minute"
 msgstr "hodina:minuta"
 
-#: ../../mod/events.php:433
+#: ../../mod/events.php:444
 msgid "Event details"
 msgstr "Detaily události"
 
-#: ../../mod/events.php:434
+#: ../../mod/events.php:445
 #, 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:436
+#: ../../mod/events.php:447
 msgid "Event Starts:"
 msgstr "Událost začíná:"
 
-#: ../../mod/events.php:436 ../../mod/events.php:450
+#: ../../mod/events.php:447 ../../mod/events.php:461
 msgid "Required"
 msgstr "Vyžadováno"
 
-#: ../../mod/events.php:439
+#: ../../mod/events.php:450
 msgid "Finish date/time is not known or not relevant"
 msgstr "Datum/čas konce není zadán nebo není relevantní"
 
-#: ../../mod/events.php:441
+#: ../../mod/events.php:452
 msgid "Event Finishes:"
 msgstr "Akce končí:"
 
-#: ../../mod/events.php:444
+#: ../../mod/events.php:455
 msgid "Adjust for viewer timezone"
 msgstr "Nastavit časové pásmo pro uživatele s právem pro čtení"
 
-#: ../../mod/events.php:446
+#: ../../mod/events.php:457
 msgid "Description:"
 msgstr "Popis:"
 
-#: ../../mod/events.php:448 ../../mod/directory.php:134
+#: ../../mod/events.php:459 ../../mod/directory.php:134
 #: ../../addon/forumdirectory/forumdirectory.php:156
-#: ../../include/event.php:40 ../../include/bb2diaspora.php:412
-#: ../../boot.php:1278
+#: ../../include/event.php:40 ../../include/bb2diaspora.php:415
+#: ../../boot.php:1312
 msgid "Location:"
 msgstr "Místo:"
 
-#: ../../mod/events.php:450
+#: ../../mod/events.php:461
 msgid "Title:"
 msgstr "Název:"
 
-#: ../../mod/events.php:452
+#: ../../mod/events.php:463
 msgid "Share this event"
 msgstr "Sdílet tuto událost"
 
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:145
-#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:560
-#: ../../mod/settings.php:586 ../../addon/js_upload/js_upload.php:45
-#: ../../include/conversation.php:1009
+#: ../../mod/dfrn_request.php:848 ../../mod/settings.php:561
+#: ../../mod/settings.php:587 ../../mod/fbrowser.php:81
+#: ../../mod/fbrowser.php:116 ../../addon/js_upload/js_upload.php:45
+#: ../../include/conversation.php:1045
 #: ../../addon.old/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr "Zrušit"
@@ -410,44 +411,44 @@ msgid ""
 " and/or create new posts for you?"
 msgstr "Chcete umožnit této aplikaci přístup k vašim příspěvkům a kontaktům a/nebo k vytváření Vašich nových příspěvků?"
 
-#: ../../mod/api.php:105 ../../mod/dfrn_request.php:835
-#: ../../mod/settings.php:933 ../../mod/settings.php:939
-#: ../../mod/settings.php:947 ../../mod/settings.php:951
-#: ../../mod/settings.php:956 ../../mod/settings.php:962
-#: ../../mod/settings.php:968 ../../mod/settings.php:974
-#: ../../mod/settings.php:1004 ../../mod/settings.php:1005
-#: ../../mod/settings.php:1006 ../../mod/settings.php:1007
-#: ../../mod/settings.php:1008 ../../mod/register.php:237
+#: ../../mod/api.php:105 ../../mod/dfrn_request.php:836
+#: ../../mod/settings.php:934 ../../mod/settings.php:940
+#: ../../mod/settings.php:948 ../../mod/settings.php:952
+#: ../../mod/settings.php:957 ../../mod/settings.php:963
+#: ../../mod/settings.php:969 ../../mod/settings.php:975
+#: ../../mod/settings.php:1005 ../../mod/settings.php:1006
+#: ../../mod/settings.php:1007 ../../mod/settings.php:1008
+#: ../../mod/settings.php:1009 ../../mod/register.php:237
 #: ../../mod/profiles.php:584
 msgid "Yes"
 msgstr "Ano"
 
-#: ../../mod/api.php:106 ../../mod/dfrn_request.php:836
-#: ../../mod/settings.php:933 ../../mod/settings.php:939
-#: ../../mod/settings.php:947 ../../mod/settings.php:951
-#: ../../mod/settings.php:956 ../../mod/settings.php:962
-#: ../../mod/settings.php:968 ../../mod/settings.php:974
-#: ../../mod/settings.php:1004 ../../mod/settings.php:1005
-#: ../../mod/settings.php:1006 ../../mod/settings.php:1007
-#: ../../mod/settings.php:1008 ../../mod/register.php:238
+#: ../../mod/api.php:106 ../../mod/dfrn_request.php:837
+#: ../../mod/settings.php:934 ../../mod/settings.php:940
+#: ../../mod/settings.php:948 ../../mod/settings.php:952
+#: ../../mod/settings.php:957 ../../mod/settings.php:963
+#: ../../mod/settings.php:969 ../../mod/settings.php:975
+#: ../../mod/settings.php:1005 ../../mod/settings.php:1006
+#: ../../mod/settings.php:1007 ../../mod/settings.php:1008
+#: ../../mod/settings.php:1009 ../../mod/register.php:238
 #: ../../mod/profiles.php:585
 msgid "No"
 msgstr "Ne"
 
-#: ../../mod/photos.php:51 ../../boot.php:1741
+#: ../../mod/photos.php:51 ../../boot.php:1784
 msgid "Photo Albums"
 msgstr "Fotoalba"
 
 #: ../../mod/photos.php:59 ../../mod/photos.php:154 ../../mod/photos.php:1009
-#: ../../mod/photos.php:1092 ../../mod/photos.php:1107
-#: ../../mod/photos.php:1562 ../../mod/photos.php:1574
-#: ../../addon/communityhome/communityhome.php:111
-#: ../../view/theme/diabook/theme.php:492
+#: ../../mod/photos.php:1102 ../../mod/photos.php:1125
+#: ../../mod/photos.php:1626 ../../mod/photos.php:1638
+#: ../../addon/communityhome/communityhome.php:112
+#: ../../view/theme/diabook/theme.php:493
 #: ../../addon.old/communityhome/communityhome.php:110
 msgid "Contact Photos"
 msgstr "Fotogalerie kontaktu"
 
-#: ../../mod/photos.php:66 ../../mod/photos.php:1123 ../../mod/photos.php:1612
+#: ../../mod/photos.php:66 ../../mod/photos.php:1141 ../../mod/photos.php:1685
 msgid "Upload New Photos"
 msgstr "Nahrát nové fotografie"
 
@@ -459,13 +460,13 @@ msgstr "Žádost o připojení selhala nebo byla zrušena."
 msgid "Contact information unavailable"
 msgstr "Kontakt byl zablokován"
 
-#: ../../mod/photos.php:154 ../../mod/photos.php:676 ../../mod/photos.php:1092
-#: ../../mod/photos.php:1107 ../../mod/profile_photo.php:74
+#: ../../mod/photos.php:154 ../../mod/photos.php:676 ../../mod/photos.php:1102
+#: ../../mod/photos.php:1125 ../../mod/profile_photo.php:74
 #: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88
 #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
 #: ../../mod/profile_photo.php:305
-#: ../../addon/communityhome/communityhome.php:112
-#: ../../view/theme/diabook/theme.php:493 ../../include/user.php:324
+#: ../../addon/communityhome/communityhome.php:113
+#: ../../view/theme/diabook/theme.php:494 ../../include/user.php:324
 #: ../../include/user.php:331 ../../include/user.php:338
 #: ../../addon.old/communityhome/communityhome.php:111
 msgid "Profile Photos"
@@ -475,11 +476,11 @@ msgstr "Profilové fotografie"
 msgid "Album not found."
 msgstr "Album nenalezeno."
 
-#: ../../mod/photos.php:182 ../../mod/photos.php:1101
+#: ../../mod/photos.php:182 ../../mod/photos.php:1119
 msgid "Delete Album"
 msgstr "Smazat album"
 
-#: ../../mod/photos.php:245 ../../mod/photos.php:1364
+#: ../../mod/photos.php:245 ../../mod/photos.php:1403
 msgid "Delete Photo"
 msgstr "Smazat fotografii"
 
@@ -512,7 +513,7 @@ msgid "Image upload failed."
 msgstr "Nahrání obrázku selhalo."
 
 #: ../../mod/photos.php:865 ../../mod/community.php:18
-#: ../../mod/dfrn_request.php:760 ../../mod/viewcontacts.php:17
+#: ../../mod/dfrn_request.php:761 ../../mod/viewcontacts.php:17
 #: ../../mod/display.php:7 ../../mod/search.php:89 ../../mod/directory.php:31
 #: ../../addon/forumdirectory/forumdirectory.php:53
 msgid "Public access denied."
@@ -531,157 +532,157 @@ msgstr "Přístup k této položce je omezen."
 msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
 msgstr "Použil jste %1$.2f Mbajtů z %2$.2f Mbajtů úložiště fotografií."
 
-#: ../../mod/photos.php:1043
+#: ../../mod/photos.php:1053
 msgid "Upload Photos"
 msgstr "Nahrání fotografií "
 
-#: ../../mod/photos.php:1047 ../../mod/photos.php:1096
+#: ../../mod/photos.php:1057 ../../mod/photos.php:1114
 msgid "New album name: "
 msgstr "Název nového alba: "
 
-#: ../../mod/photos.php:1048
+#: ../../mod/photos.php:1058
 msgid "or existing album name: "
 msgstr "nebo stávající název alba: "
 
-#: ../../mod/photos.php:1049
+#: ../../mod/photos.php:1059
 msgid "Do not show a status post for this upload"
 msgstr "Nezobrazovat stav pro tento upload"
 
-#: ../../mod/photos.php:1051 ../../mod/photos.php:1359
+#: ../../mod/photos.php:1061 ../../mod/photos.php:1398
 msgid "Permissions"
 msgstr "Oprávnění:"
 
-#: ../../mod/photos.php:1111
+#: ../../mod/photos.php:1129
 msgid "Edit Album"
 msgstr "Edituj album"
 
-#: ../../mod/photos.php:1117
+#: ../../mod/photos.php:1135
 msgid "Show Newest First"
 msgstr "Zobrazit nejprve nejnovější:"
 
-#: ../../mod/photos.php:1119
+#: ../../mod/photos.php:1137
 msgid "Show Oldest First"
 msgstr "Zobrazit nejprve nejstarší:"
 
-#: ../../mod/photos.php:1143 ../../mod/photos.php:1595
+#: ../../mod/photos.php:1170 ../../mod/photos.php:1668
 msgid "View Photo"
 msgstr "Zobraz fotografii"
 
-#: ../../mod/photos.php:1178
+#: ../../mod/photos.php:1205
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "Oprávnění bylo zamítnuto. Přístup k této položce může být omezen."
 
-#: ../../mod/photos.php:1180
+#: ../../mod/photos.php:1207
 msgid "Photo not available"
 msgstr "Fotografie není k dispozici"
 
-#: ../../mod/photos.php:1236
+#: ../../mod/photos.php:1263
 msgid "View photo"
 msgstr "Zobrazit obrázek"
 
-#: ../../mod/photos.php:1236
+#: ../../mod/photos.php:1263
 msgid "Edit photo"
 msgstr "Editovat fotografii"
 
-#: ../../mod/photos.php:1237
+#: ../../mod/photos.php:1264
 msgid "Use as profile photo"
 msgstr "Použít jako profilovou fotografii"
 
-#: ../../mod/photos.php:1243 ../../mod/content.php:603
+#: ../../mod/photos.php:1270 ../../mod/content.php:620
 #: ../../object/Item.php:105
 msgid "Private Message"
 msgstr "Soukromá zpráva"
 
-#: ../../mod/photos.php:1262
+#: ../../mod/photos.php:1289
 msgid "View Full Size"
 msgstr "Zobrazit v plné velikosti"
 
-#: ../../mod/photos.php:1336
+#: ../../mod/photos.php:1363
 msgid "Tags: "
 msgstr "Štítky: "
 
-#: ../../mod/photos.php:1339
+#: ../../mod/photos.php:1366
 msgid "[Remove any tag]"
 msgstr "[Odstranit všechny štítky]"
 
-#: ../../mod/photos.php:1349
+#: ../../mod/photos.php:1388
 msgid "Rotate CW (right)"
 msgstr "Rotovat po směru hodinových ručiček (doprava)"
 
-#: ../../mod/photos.php:1350
+#: ../../mod/photos.php:1389
 msgid "Rotate CCW (left)"
 msgstr "Rotovat proti směru hodinových ručiček (doleva)"
 
-#: ../../mod/photos.php:1352
+#: ../../mod/photos.php:1391
 msgid "New album name"
 msgstr "Nové jméno alba"
 
-#: ../../mod/photos.php:1355
+#: ../../mod/photos.php:1394
 msgid "Caption"
 msgstr "Titulek"
 
-#: ../../mod/photos.php:1357
+#: ../../mod/photos.php:1396
 msgid "Add a Tag"
 msgstr "Přidat štítek"
 
-#: ../../mod/photos.php:1361
+#: ../../mod/photos.php:1400
 msgid ""
 "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr "Příklad: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 
-#: ../../mod/photos.php:1381 ../../mod/content.php:667
+#: ../../mod/photos.php:1420 ../../mod/content.php:684
 #: ../../object/Item.php:203
 msgid "I like this (toggle)"
 msgstr "Líbí se mi to (přepínač)"
 
-#: ../../mod/photos.php:1382 ../../mod/content.php:668
+#: ../../mod/photos.php:1421 ../../mod/content.php:685
 #: ../../object/Item.php:204
 msgid "I don't like this (toggle)"
 msgstr "Nelíbí se mi to (přepínač)"
 
-#: ../../mod/photos.php:1383 ../../include/conversation.php:969
+#: ../../mod/photos.php:1422 ../../include/conversation.php:1005
 msgid "Share"
 msgstr "Sdílet"
 
-#: ../../mod/photos.php:1384 ../../mod/editpost.php:121
-#: ../../mod/content.php:482 ../../mod/content.php:848
+#: ../../mod/photos.php:1423 ../../mod/editpost.php:121
+#: ../../mod/content.php:499 ../../mod/content.php:883
 #: ../../mod/wallmessage.php:152 ../../mod/message.php:300
-#: ../../mod/message.php:488 ../../include/conversation.php:624
-#: ../../include/conversation.php:988 ../../object/Item.php:270
+#: ../../mod/message.php:528 ../../include/conversation.php:645
+#: ../../include/conversation.php:1024 ../../object/Item.php:287
 msgid "Please wait"
 msgstr "Čekejte prosím"
 
-#: ../../mod/photos.php:1400 ../../mod/photos.php:1444
-#: ../../mod/photos.php:1516 ../../mod/content.php:690
-#: ../../object/Item.php:574
+#: ../../mod/photos.php:1439 ../../mod/photos.php:1483
+#: ../../mod/photos.php:1566 ../../mod/content.php:707
+#: ../../object/Item.php:600
 msgid "This is you"
 msgstr "Nastavte Vaši polohu"
 
-#: ../../mod/photos.php:1402 ../../mod/photos.php:1446
-#: ../../mod/photos.php:1518 ../../mod/content.php:692 ../../boot.php:608
-#: ../../object/Item.php:267 ../../object/Item.php:576
+#: ../../mod/photos.php:1441 ../../mod/photos.php:1485
+#: ../../mod/photos.php:1568 ../../mod/content.php:709 ../../boot.php:635
+#: ../../object/Item.php:284 ../../object/Item.php:602
 msgid "Comment"
 msgstr "Okomentovat"
 
-#: ../../mod/photos.php:1404 ../../mod/photos.php:1448
-#: ../../mod/photos.php:1520 ../../mod/editpost.php:142
-#: ../../mod/content.php:702 ../../include/conversation.php:1006
-#: ../../object/Item.php:586
+#: ../../mod/photos.php:1443 ../../mod/photos.php:1487
+#: ../../mod/photos.php:1570 ../../mod/editpost.php:142
+#: ../../mod/content.php:719 ../../include/conversation.php:1042
+#: ../../object/Item.php:612
 msgid "Preview"
 msgstr "Náhled"
 
-#: ../../mod/photos.php:1488 ../../mod/content.php:439
-#: ../../mod/content.php:724 ../../mod/settings.php:622
-#: ../../mod/group.php:168 ../../mod/admin.php:699
+#: ../../mod/photos.php:1527 ../../mod/content.php:439
+#: ../../mod/content.php:741 ../../mod/settings.php:623
+#: ../../mod/group.php:171 ../../mod/admin.php:735
 #: ../../include/conversation.php:569 ../../object/Item.php:119
 msgid "Delete"
 msgstr "Odstranit"
 
-#: ../../mod/photos.php:1601
+#: ../../mod/photos.php:1674
 msgid "View Album"
 msgstr "Zobrazit album"
 
-#: ../../mod/photos.php:1610
+#: ../../mod/photos.php:1683
 msgid "Recent Photos"
 msgstr "Aktuální fotografie"
 
@@ -689,7 +690,7 @@ msgstr "Aktuální fotografie"
 msgid "Not available."
 msgstr "Není k dispozici."
 
-#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93
+#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:94
 #: ../../include/nav.php:101
 msgid "Community"
 msgstr "Komunita"
@@ -739,96 +740,96 @@ msgstr "Položka nenalezena"
 msgid "Edit post"
 msgstr "Upravit příspěvek"
 
-#: ../../mod/editpost.php:91 ../../include/conversation.php:955
+#: ../../mod/editpost.php:91 ../../include/conversation.php:991
 msgid "Post to Email"
 msgstr "Poslat příspěvek na e-mail"
 
-#: ../../mod/editpost.php:106 ../../mod/content.php:711
-#: ../../mod/settings.php:621 ../../object/Item.php:109
+#: ../../mod/editpost.php:106 ../../mod/content.php:728
+#: ../../mod/settings.php:622 ../../object/Item.php:109
 msgid "Edit"
 msgstr "Upravit"
 
 #: ../../mod/editpost.php:107 ../../mod/wallmessage.php:150
-#: ../../mod/message.php:298 ../../mod/message.php:485
-#: ../../include/conversation.php:970
+#: ../../mod/message.php:298 ../../mod/message.php:525
+#: ../../include/conversation.php:1006
 msgid "Upload photo"
 msgstr "Nahrát fotografii"
 
-#: ../../mod/editpost.php:108 ../../include/conversation.php:971
+#: ../../mod/editpost.php:108 ../../include/conversation.php:1007
 msgid "upload photo"
 msgstr "nahrát fotky"
 
-#: ../../mod/editpost.php:109 ../../include/conversation.php:972
+#: ../../mod/editpost.php:109 ../../include/conversation.php:1008
 msgid "Attach file"
 msgstr "Přiložit soubor"
 
-#: ../../mod/editpost.php:110 ../../include/conversation.php:973
+#: ../../mod/editpost.php:110 ../../include/conversation.php:1009
 msgid "attach file"
 msgstr "přidat soubor"
 
 #: ../../mod/editpost.php:111 ../../mod/wallmessage.php:151
-#: ../../mod/message.php:299 ../../mod/message.php:486
-#: ../../include/conversation.php:974
+#: ../../mod/message.php:299 ../../mod/message.php:526
+#: ../../include/conversation.php:1010
 msgid "Insert web link"
 msgstr "Vložit webový odkaz"
 
-#: ../../mod/editpost.php:112 ../../include/conversation.php:975
+#: ../../mod/editpost.php:112 ../../include/conversation.php:1011
 msgid "web link"
 msgstr "webový odkaz"
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:976
+#: ../../mod/editpost.php:113 ../../include/conversation.php:1012
 msgid "Insert video link"
 msgstr "Zadejte odkaz na video"
 
-#: ../../mod/editpost.php:114 ../../include/conversation.php:977
+#: ../../mod/editpost.php:114 ../../include/conversation.php:1013
 msgid "video link"
 msgstr "odkaz na video"
 
-#: ../../mod/editpost.php:115 ../../include/conversation.php:978
+#: ../../mod/editpost.php:115 ../../include/conversation.php:1014
 msgid "Insert audio link"
 msgstr "Zadejte odkaz na zvukový záznam"
 
-#: ../../mod/editpost.php:116 ../../include/conversation.php:979
+#: ../../mod/editpost.php:116 ../../include/conversation.php:1015
 msgid "audio link"
 msgstr "odkaz na audio"
 
-#: ../../mod/editpost.php:117 ../../include/conversation.php:980
+#: ../../mod/editpost.php:117 ../../include/conversation.php:1016
 msgid "Set your location"
 msgstr "Nastavte vaši polohu"
 
-#: ../../mod/editpost.php:118 ../../include/conversation.php:981
+#: ../../mod/editpost.php:118 ../../include/conversation.php:1017
 msgid "set location"
 msgstr "nastavit místo"
 
-#: ../../mod/editpost.php:119 ../../include/conversation.php:982
+#: ../../mod/editpost.php:119 ../../include/conversation.php:1018
 msgid "Clear browser location"
 msgstr "Odstranit adresu v prohlížeči"
 
-#: ../../mod/editpost.php:120 ../../include/conversation.php:983
+#: ../../mod/editpost.php:120 ../../include/conversation.php:1019
 msgid "clear location"
 msgstr "vymazat místo"
 
-#: ../../mod/editpost.php:122 ../../include/conversation.php:989
+#: ../../mod/editpost.php:122 ../../include/conversation.php:1025
 msgid "Permission settings"
 msgstr "Nastavení oprávnění"
 
-#: ../../mod/editpost.php:130 ../../include/conversation.php:998
+#: ../../mod/editpost.php:130 ../../include/conversation.php:1034
 msgid "CC: email addresses"
 msgstr "skrytá kopie: e-mailové adresy"
 
-#: ../../mod/editpost.php:131 ../../include/conversation.php:999
+#: ../../mod/editpost.php:131 ../../include/conversation.php:1035
 msgid "Public post"
 msgstr "Veřejný příspěvek"
 
-#: ../../mod/editpost.php:134 ../../include/conversation.php:985
+#: ../../mod/editpost.php:134 ../../include/conversation.php:1021
 msgid "Set title"
 msgstr "Nastavit titulek"
 
-#: ../../mod/editpost.php:136 ../../include/conversation.php:987
+#: ../../mod/editpost.php:136 ../../include/conversation.php:1023
 msgid "Categories (comma-separated list)"
 msgstr "Kategorie (čárkou oddělený seznam)"
 
-#: ../../mod/editpost.php:137 ../../include/conversation.php:1001
+#: ../../mod/editpost.php:137 ../../include/conversation.php:1037
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Příklad: bob@example.com, mary@example.com"
 
@@ -836,19 +837,19 @@ msgstr "Příklad: bob@example.com, mary@example.com"
 msgid "This introduction has already been accepted."
 msgstr "Toto pozvání již bylo přijato."
 
-#: ../../mod/dfrn_request.php:118 ../../mod/dfrn_request.php:512
+#: ../../mod/dfrn_request.php:118 ../../mod/dfrn_request.php:513
 msgid "Profile location is not valid or does not contain profile information."
 msgstr "Adresa profilu není platná nebo neobsahuje profilové informace"
 
-#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:517
+#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:518
 msgid "Warning: profile location has no identifiable owner name."
 msgstr "Varování: umístění profilu nemá žádné identifikovatelné jméno vlastníka"
 
-#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:519
+#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:520
 msgid "Warning: profile location has no profile photo."
 msgstr "Varování: umístění profilu nemá žádnou profilovou fotografii."
 
-#: ../../mod/dfrn_request.php:128 ../../mod/dfrn_request.php:522
+#: ../../mod/dfrn_request.php:128 ../../mod/dfrn_request.php:523
 #, php-format
 msgid "%d required parameter was not found at the given location"
 msgid_plural "%d required parameters were not found at the given location"
@@ -889,140 +890,140 @@ msgstr "Neplatný odkaz"
 msgid "Invalid email address."
 msgstr "Neplatná emailová adresa"
 
-#: ../../mod/dfrn_request.php:361
+#: ../../mod/dfrn_request.php:362
 msgid "This account has not been configured for email. Request failed."
 msgstr "Tento účet nebyl nastaven pro email. Požadavek nesplněn."
 
-#: ../../mod/dfrn_request.php:457
+#: ../../mod/dfrn_request.php:458
 msgid "Unable to resolve your name at the provided location."
 msgstr "Nepodařilo se zjistit Vaše jméno na zadané adrese."
 
-#: ../../mod/dfrn_request.php:470
+#: ../../mod/dfrn_request.php:471
 msgid "You have already introduced yourself here."
 msgstr "Již jste se zde zavedli."
 
-#: ../../mod/dfrn_request.php:474
+#: ../../mod/dfrn_request.php:475
 #, php-format
 msgid "Apparently you are already friends with %s."
 msgstr "Zřejmě jste již přátelé se %s."
 
-#: ../../mod/dfrn_request.php:495
+#: ../../mod/dfrn_request.php:496
 msgid "Invalid profile URL."
 msgstr "Neplatné URL profilu."
 
-#: ../../mod/dfrn_request.php:501 ../../include/follow.php:27
+#: ../../mod/dfrn_request.php:502 ../../include/follow.php:27
 msgid "Disallowed profile URL."
 msgstr "Nepovolené URL profilu."
 
-#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:124
+#: ../../mod/dfrn_request.php:571 ../../mod/contacts.php:124
 msgid "Failed to update contact record."
 msgstr "Nepodařilo se aktualizovat kontakt."
 
-#: ../../mod/dfrn_request.php:591
+#: ../../mod/dfrn_request.php:592
 msgid "Your introduction has been sent."
 msgstr "Vaše žádost o propojení byla odeslána."
 
-#: ../../mod/dfrn_request.php:644
+#: ../../mod/dfrn_request.php:645
 msgid "Please login to confirm introduction."
 msgstr "Prosím přihlašte se k potvrzení žádosti o propojení."
 
-#: ../../mod/dfrn_request.php:658
+#: ../../mod/dfrn_request.php:659
 msgid ""
 "Incorrect identity currently logged in. Please login to "
 "<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:669
+#: ../../mod/dfrn_request.php:670
 msgid "Hide this contact"
 msgstr "Skrýt tento kontakt"
 
-#: ../../mod/dfrn_request.php:672
+#: ../../mod/dfrn_request.php:673
 #, php-format
 msgid "Welcome home %s."
 msgstr "Vítejte doma %s."
 
-#: ../../mod/dfrn_request.php:673
+#: ../../mod/dfrn_request.php:674
 #, 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:674
+#: ../../mod/dfrn_request.php:675
 msgid "Confirm"
 msgstr "Potvrdit"
 
-#: ../../mod/dfrn_request.php:715 ../../include/items.php:3356
+#: ../../mod/dfrn_request.php:716 ../../include/items.php:3366
 msgid "[Name Withheld]"
 msgstr "[Jméno odepřeno]"
 
-#: ../../mod/dfrn_request.php:810
+#: ../../mod/dfrn_request.php:811
 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:826
+#: ../../mod/dfrn_request.php:827
 msgid "<strike>Connect as an email follower</strike> (Coming soon)"
 msgstr "<strike>Připojte se jako emailový následovník</strike> (Již brzy)"
 
-#: ../../mod/dfrn_request.php:828
+#: ../../mod/dfrn_request.php:829
 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:831
+#: ../../mod/dfrn_request.php:832
 msgid "Friend/Connection Request"
 msgstr "Požadavek o přátelství / kontaktování"
 
-#: ../../mod/dfrn_request.php:832
+#: ../../mod/dfrn_request.php:833
 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:833
+#: ../../mod/dfrn_request.php:834
 msgid "Please answer the following:"
 msgstr "Odpovězte, prosím, následující:"
 
-#: ../../mod/dfrn_request.php:834
+#: ../../mod/dfrn_request.php:835
 #, php-format
 msgid "Does %s know you?"
 msgstr "Zná Vás uživatel %s ?"
 
-#: ../../mod/dfrn_request.php:837
+#: ../../mod/dfrn_request.php:838
 msgid "Add a personal note:"
 msgstr "Přidat osobní poznámku:"
 
-#: ../../mod/dfrn_request.php:839 ../../include/contact_selectors.php:76
+#: ../../mod/dfrn_request.php:840 ../../include/contact_selectors.php:76
 msgid "Friendica"
 msgstr "Friendica"
 
-#: ../../mod/dfrn_request.php:840
+#: ../../mod/dfrn_request.php:841
 msgid "StatusNet/Federated Social Web"
 msgstr "StatusNet / Federativní Sociální Web"
 
-#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:681
+#: ../../mod/dfrn_request.php:842 ../../mod/settings.php:681
 #: ../../include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr "Diaspora"
 
-#: ../../mod/dfrn_request.php:842
+#: ../../mod/dfrn_request.php:843
 #, 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:843
+#: ../../mod/dfrn_request.php:844
 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:846
+#: ../../mod/dfrn_request.php:847
 msgid "Submit Request"
 msgstr "Odeslat žádost"
 
-#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:138
+#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:140
 msgid "Account settings"
 msgstr "Nastavení účtu"
 
@@ -1051,10 +1052,10 @@ msgid "Remove account"
 msgstr "Odstranit účet"
 
 #: ../../mod/uexport.php:48 ../../mod/settings.php:74
-#: ../../mod/newmember.php:22 ../../mod/admin.php:788 ../../mod/admin.php:993
+#: ../../mod/newmember.php:22 ../../mod/admin.php:824 ../../mod/admin.php:1029
 #: ../../addon/dav/friendica/layout.fnk.php:225
-#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537
-#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:138
+#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:538
+#: ../../view/theme/diabook/theme.php:659 ../../include/nav.php:140
 #: ../../addon.old/dav/friendica/layout.fnk.php:225
 #: ../../addon.old/mathjax/mathjax.php:36
 msgid "Settings"
@@ -1103,240 +1104,269 @@ msgid ""
 "or mysql."
 msgstr "Toto je nejčastěji nastavením oprávnění, kdy webový server nemusí být schopen zapisovat soubory do Vašeho adresáře - i když Vy můžete."
 
-#: ../../mod/install.php:139 ../../mod/install.php:204
-#: ../../mod/install.php:488
+#: ../../mod/install.php:139 ../../mod/install.php:206
+#: ../../mod/install.php:506
 msgid "Please see the file \"INSTALL.txt\"."
 msgstr "Přečtěte si prosím informace v souboru \"INSTALL.txt\"."
 
-#: ../../mod/install.php:201
+#: ../../mod/install.php:203
 msgid "System check"
 msgstr "Testování systému"
 
-#: ../../mod/install.php:206
+#: ../../mod/install.php:208
 msgid "Check again"
 msgstr "Otestovat znovu"
 
-#: ../../mod/install.php:225
+#: ../../mod/install.php:227
 msgid "Database connection"
 msgstr "Databázové spojení"
 
-#: ../../mod/install.php:226
+#: ../../mod/install.php:228
 msgid ""
 "In order to install Friendica we need to know how to connect to your "
 "database."
 msgstr "Pro instalaci Friendica potřeujeme znát připojení k Vaší databázi."
 
-#: ../../mod/install.php:227
+#: ../../mod/install.php:229
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
 msgstr "Pokud máte otázky k následujícím nastavením, obraťte se na svého poskytovatele hostingu nebo administrátora serveru, "
 
-#: ../../mod/install.php:228
+#: ../../mod/install.php:230
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
 msgstr "Databáze, kterou uvedete níže, by již měla existovat. Pokud to tak není, prosíme, vytvořte ji před pokračováním."
 
-#: ../../mod/install.php:232
+#: ../../mod/install.php:234
 msgid "Database Server Name"
 msgstr "Jméno databázového serveru"
 
-#: ../../mod/install.php:233
+#: ../../mod/install.php:235
 msgid "Database Login Name"
 msgstr "Přihlašovací jméno k databázi"
 
-#: ../../mod/install.php:234
+#: ../../mod/install.php:236
 msgid "Database Login Password"
 msgstr "Heslo k databázovému účtu "
 
-#: ../../mod/install.php:235
+#: ../../mod/install.php:237
 msgid "Database Name"
 msgstr "Jméno databáze"
 
-#: ../../mod/install.php:236 ../../mod/install.php:275
+#: ../../mod/install.php:238 ../../mod/install.php:277
 msgid "Site administrator email address"
 msgstr "Emailová adresa administrátora webu"
 
-#: ../../mod/install.php:236 ../../mod/install.php:275
+#: ../../mod/install.php:238 ../../mod/install.php:277
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
 msgstr "Vaše emailová adresa účtu se musí s touto shodovat, aby bylo možné využívat administrační panel ve webovém rozhraní."
 
-#: ../../mod/install.php:240 ../../mod/install.php:278
+#: ../../mod/install.php:242 ../../mod/install.php:280
 msgid "Please select a default timezone for your website"
 msgstr "Prosím, vyberte výchozí časové pásmo pro váš server"
 
-#: ../../mod/install.php:265
+#: ../../mod/install.php:267
 msgid "Site settings"
 msgstr "Nastavení webu"
 
-#: ../../mod/install.php:318
+#: ../../mod/install.php:320
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr "Nelze najít verzi PHP pro příkazový řádek v PATH webového serveru."
 
-#: ../../mod/install.php:319
+#: ../../mod/install.php:321
 msgid ""
 "If you don't have a command line version of PHP installed on server, you "
 "will not be able to run background polling via cron. See <a "
 "href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>"
 msgstr "Pokud na serveru nemáte nainstalovánu verzi PHP spustitelnou z příkazového řádku, nebudete moci spouštět na pozadí synchronizaci zpráv prostřednictvím cronu. Přečtěte si <a href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>\n\n    podrobnosti\n    návrhy\n    historie\n\n\t\nThe following url is either missing from the translation or has been translated: 'http://friendica.com/node/27'>'Activating scheduled tasks'</a>"
 
-#: ../../mod/install.php:323
+#: ../../mod/install.php:325
 msgid "PHP executable path"
 msgstr "Cesta k \"PHP executable\""
 
-#: ../../mod/install.php:323
+#: ../../mod/install.php:325
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr "Zadejte plnou cestu k spustitelnému souboru php. Tento údaj můžete ponechat nevyplněný a pokračovat v instalaci."
 
-#: ../../mod/install.php:328
+#: ../../mod/install.php:330
 msgid "Command line PHP"
 msgstr "Příkazový řádek PHP"
 
-#: ../../mod/install.php:337
+#: ../../mod/install.php:339
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr "Vyberte prosím profil, který chcete zobrazit %s při zabezpečeném prohlížení Vašeho profilu."
 
-#: ../../mod/install.php:338
+#: ../../mod/install.php:340
 msgid "This is required for message delivery to work."
 msgstr "Toto je nutné pro fungování doručování zpráv."
 
-#: ../../mod/install.php:340
+#: ../../mod/install.php:342
 msgid "PHP register_argc_argv"
 msgstr "PHP register_argc_argv"
 
-#: ../../mod/install.php:361
+#: ../../mod/install.php:363
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr "Chyba: funkce \"openssl_pkey_new\" na tomto systému není schopna generovat šifrovací klíče"
 
-#: ../../mod/install.php:362
+#: ../../mod/install.php:364
 msgid ""
 "If running under Windows, please see "
 "\"http://www.php.net/manual/en/openssl.installation.php\"."
 msgstr "Pokud systém běží na Windows, seznamte se s \"http://www.php.net/manual/en/openssl.installation.php\"."
 
-#: ../../mod/install.php:364
+#: ../../mod/install.php:366
 msgid "Generate encryption keys"
 msgstr "Generovat kriptovací klíče"
 
-#: ../../mod/install.php:371
+#: ../../mod/install.php:373
 msgid "libCurl PHP module"
 msgstr "libCurl PHP modul"
 
-#: ../../mod/install.php:372
+#: ../../mod/install.php:374
 msgid "GD graphics PHP module"
 msgstr "GD graphics PHP modul"
 
-#: ../../mod/install.php:373
+#: ../../mod/install.php:375
 msgid "OpenSSL PHP module"
 msgstr "OpenSSL PHP modul"
 
-#: ../../mod/install.php:374
+#: ../../mod/install.php:376
 msgid "mysqli PHP module"
 msgstr "mysqli PHP modul"
 
-#: ../../mod/install.php:375
+#: ../../mod/install.php:377
 msgid "mb_string PHP module"
 msgstr "mb_string PHP modul"
 
-#: ../../mod/install.php:380 ../../mod/install.php:382
+#: ../../mod/install.php:382 ../../mod/install.php:384
 msgid "Apache mod_rewrite module"
 msgstr "Apache mod_rewrite modul"
 
-#: ../../mod/install.php:380
+#: ../../mod/install.php:382
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr "Chyba: Požadovaný Apache webserver mod-rewrite modul není nainstalován."
 
-#: ../../mod/install.php:388
+#: ../../mod/install.php:390
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "Chyba: požadovaný libcurl PHP modul není nainstalován."
 
-#: ../../mod/install.php:392
+#: ../../mod/install.php:394
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr "Chyba: požadovaný GD graphics PHP modul není nainstalován."
 
-#: ../../mod/install.php:396
+#: ../../mod/install.php:398
 msgid "Error: openssl PHP module required but not installed."
 msgstr "Chyba: požadovaný openssl PHP modul není nainstalován."
 
-#: ../../mod/install.php:400
+#: ../../mod/install.php:402
 msgid "Error: mysqli PHP module required but not installed."
 msgstr "Chyba: požadovaný mysqli PHP modul není nainstalován."
 
-#: ../../mod/install.php:404
+#: ../../mod/install.php:406
 msgid "Error: mb_string PHP module required but not installed."
 msgstr "Chyba: PHP modul mb_string  je vyžadován, ale není nainstalován."
 
-#: ../../mod/install.php:421
+#: ../../mod/install.php:423
 msgid ""
 "The web installer needs to be able to create a file called \".htconfig.php\""
 " in the top folder of your web server and it is unable to do so."
 msgstr "Webový instalátor musí být schopen vytvořit soubor s názvem \".htconfig.php\" v hlavním adresáři vašeho webového serveru ale nyní mu to není umožněno."
 
-#: ../../mod/install.php:422
+#: ../../mod/install.php:424
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
 msgstr "Toto je nejčastěji nastavením oprávnění, kdy webový server nemusí být schopen zapisovat soubory do vašeho adresáře - i když Vy můžete."
 
-#: ../../mod/install.php:423
+#: ../../mod/install.php:425
 msgid ""
 "At the end of this procedure, we will give you a text to save in a file "
 "named .htconfig.php in your Friendica top folder."
 msgstr "Na konci této procedury obd nás obdržíte text k uložení v souboru pojmenovaném .htconfig.php ve Vašem Friendica kořenovém adresáři."
 
-#: ../../mod/install.php:424
+#: ../../mod/install.php:426
 msgid ""
 "You can alternatively skip this procedure and perform a manual installation."
 " Please see the file \"INSTALL.txt\" for instructions."
 msgstr "Alternativně můžete tento krok přeskočit a provést manuální instalaci. Přečtěte si prosím soubor \"INSTALL.txt\" pro další instrukce."
 
-#: ../../mod/install.php:427
+#: ../../mod/install.php:429
 msgid ".htconfig.php is writable"
 msgstr ".htconfig.php je editovatelné"
 
 #: ../../mod/install.php:439
 msgid ""
+"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
+msgstr "Friendica používá šablonovací nástroj Smarty3 pro zobrazení svých weobvých stránek. Smarty3 kompiluje šablony do PHP pro zrychlení vykreslování."
+
+#: ../../mod/install.php:440
+msgid ""
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory view/smarty3/ under the Friendica top level "
+"folder."
+msgstr "Pro uložení kompilovaných šablon, webový server potřebuje mít přístup k zápisu do adresáře view/smarty3/ pod hlavním adresářem instalace Friendica"
+
+#: ../../mod/install.php:441
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has"
+" write access to this folder."
+msgstr "prosím ujistěte se, že uživatel web serveru (jako například www-data) má právo zápisu do tohoto adresáře"
+
+#: ../../mod/install.php:442
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"view/smarty3/ only--not the template files (.tpl) that it contains."
+msgstr "Poznámka: jako bezpečnostní opatření, přidělte právo zápisu pouze k adresáři /view/smarty3/ a nikoliv už k souborům s šablonami (.tpl), které obsahuje."
+
+#: ../../mod/install.php:445
+msgid "view/smarty3 is writable"
+msgstr "view/smarty3 je nastaven pro zápis"
+
+#: ../../mod/install.php:457
+msgid ""
 "Url rewrite in .htaccess is not working. Check your server configuration."
 msgstr "Url rewrite v .htconfig nefunguje. Prověřte prosím Vaše nastavení serveru."
 
-#: ../../mod/install.php:441
+#: ../../mod/install.php:459
 msgid "Url rewrite is working"
 msgstr "Url rewrite je funkční."
 
-#: ../../mod/install.php:451
+#: ../../mod/install.php:469
 msgid ""
 "The database configuration file \".htconfig.php\" could not be written. "
 "Please use the enclosed text to create a configuration file in your web "
 "server root."
 msgstr "Databázový konfigurační soubor \".htconfig.php\" nemohl být uložen. Prosím, použijte přiložený text k vytvoření konfiguračního souboru ve vašem kořenovém adresáři webového serveru."
 
-#: ../../mod/install.php:475
+#: ../../mod/install.php:493
 msgid "Errors encountered creating database tables."
 msgstr "Při vytváření databázových tabulek došlo k chybám."
 
-#: ../../mod/install.php:486
+#: ../../mod/install.php:504
 msgid "<h1>What next</h1>"
 msgstr "<h1>Co dál<h1>"
 
-#: ../../mod/install.php:487
+#: ../../mod/install.php:505
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the "
 "poller."
 msgstr "Webový instalátor musí být schopen vytvořit soubor s názvem \".htconfig.php\" v hlavním adresáři Vašeho webového serveru ale nyní mu to není umožněno."
 
 #: ../../mod/localtime.php:12 ../../include/event.php:11
-#: ../../include/bb2diaspora.php:390
+#: ../../include/bb2diaspora.php:393
 msgid "l F d, Y \\@ g:i A"
 msgstr "l F d, Y \\@ g:i A"
 
@@ -1402,7 +1432,7 @@ msgid "is interested in:"
 msgstr "zajímá se o:"
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1216
+#: ../../include/contact_widgets.php:9 ../../boot.php:1250
 msgid "Connect"
 msgstr "Spojit"
 
@@ -1415,7 +1445,7 @@ msgid "Remote privacy information not available."
 msgstr "Vzdálené soukromé informace nejsou k dispozici."
 
 #: ../../mod/lockview.php:48
-#: ../../addon/remote_permissions/remote_permissions.php:123
+#: ../../addon/remote_permissions/remote_permissions.php:124
 msgid "Visible to:"
 msgstr "Viditelné pro:"
 
@@ -1431,29 +1461,29 @@ msgstr "Skupina je prázdná"
 msgid "Group: "
 msgstr "Skupina: "
 
-#: ../../mod/content.php:438 ../../mod/content.php:723
+#: ../../mod/content.php:438 ../../mod/content.php:740
 #: ../../include/conversation.php:568 ../../object/Item.php:118
 msgid "Select"
 msgstr "Vybrat"
 
-#: ../../mod/content.php:455 ../../mod/content.php:817
-#: ../../mod/content.php:818 ../../include/conversation.php:587
-#: ../../object/Item.php:235 ../../object/Item.php:236
+#: ../../mod/content.php:472 ../../mod/content.php:852
+#: ../../mod/content.php:853 ../../include/conversation.php:608
+#: ../../object/Item.php:252 ../../object/Item.php:253
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Zobrazit profil uživatele %s na %s"
 
-#: ../../mod/content.php:465 ../../mod/content.php:829
-#: ../../include/conversation.php:607 ../../object/Item.php:249
+#: ../../mod/content.php:482 ../../mod/content.php:864
+#: ../../include/conversation.php:628 ../../object/Item.php:266
 #, php-format
 msgid "%s from %s"
 msgstr "%s od %s"
 
-#: ../../mod/content.php:480 ../../include/conversation.php:622
+#: ../../mod/content.php:497 ../../include/conversation.php:643
 msgid "View in context"
 msgstr "Pohled v kontextu"
 
-#: ../../mod/content.php:586 ../../object/Item.php:289
+#: ../../mod/content.php:603 ../../object/Item.php:306
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
@@ -1461,107 +1491,107 @@ msgstr[0] "%d komentář"
 msgstr[1] "%d komentářů"
 msgstr[2] "%d komentářů"
 
-#: ../../mod/content.php:588 ../../include/text.php:1446
-#: ../../object/Item.php:291 ../../object/Item.php:304
+#: ../../mod/content.php:605 ../../include/text.php:1503
+#: ../../object/Item.php:308 ../../object/Item.php:321
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] "komentář"
 
-#: ../../mod/content.php:589 ../../addon/page/page.php:77
+#: ../../mod/content.php:606 ../../addon/page/page.php:77
 #: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119
-#: ../../include/contact_widgets.php:204 ../../boot.php:609
-#: ../../object/Item.php:292 ../../addon.old/page/page.php:77
+#: ../../include/contact_widgets.php:204 ../../boot.php:636
+#: ../../object/Item.php:309 ../../addon.old/page/page.php:77
 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119
 msgid "show more"
 msgstr "zobrazit více"
 
-#: ../../mod/content.php:667 ../../object/Item.php:203
+#: ../../mod/content.php:684 ../../object/Item.php:203
 msgid "like"
 msgstr "má rád"
 
-#: ../../mod/content.php:668 ../../object/Item.php:204
+#: ../../mod/content.php:685 ../../object/Item.php:204
 msgid "dislike"
 msgstr "nemá rád"
 
-#: ../../mod/content.php:670 ../../object/Item.php:206
+#: ../../mod/content.php:687 ../../object/Item.php:206
 msgid "Share this"
 msgstr "Sdílet toto"
 
-#: ../../mod/content.php:670 ../../object/Item.php:206
+#: ../../mod/content.php:687 ../../object/Item.php:206
 msgid "share"
 msgstr "sdílí"
 
-#: ../../mod/content.php:694 ../../object/Item.php:578
+#: ../../mod/content.php:711 ../../object/Item.php:604
 msgid "Bold"
 msgstr "Tučné"
 
-#: ../../mod/content.php:695 ../../object/Item.php:579
+#: ../../mod/content.php:712 ../../object/Item.php:605
 msgid "Italic"
 msgstr "Kurzíva"
 
-#: ../../mod/content.php:696 ../../object/Item.php:580
+#: ../../mod/content.php:713 ../../object/Item.php:606
 msgid "Underline"
 msgstr "Podrtžené"
 
-#: ../../mod/content.php:697 ../../object/Item.php:581
+#: ../../mod/content.php:714 ../../object/Item.php:607
 msgid "Quote"
 msgstr "Citovat"
 
-#: ../../mod/content.php:698 ../../object/Item.php:582
+#: ../../mod/content.php:715 ../../object/Item.php:608
 msgid "Code"
 msgstr "Kód"
 
-#: ../../mod/content.php:699 ../../object/Item.php:583
+#: ../../mod/content.php:716 ../../object/Item.php:609
 msgid "Image"
 msgstr "Obrázek"
 
-#: ../../mod/content.php:700 ../../object/Item.php:584
+#: ../../mod/content.php:717 ../../object/Item.php:610
 msgid "Link"
 msgstr "Odkaz"
 
-#: ../../mod/content.php:701 ../../object/Item.php:585
+#: ../../mod/content.php:718 ../../object/Item.php:611
 msgid "Video"
 msgstr "Video"
 
-#: ../../mod/content.php:736 ../../object/Item.php:182
+#: ../../mod/content.php:753 ../../object/Item.php:182
 msgid "add star"
 msgstr "přidat hvězdu"
 
-#: ../../mod/content.php:737 ../../object/Item.php:183
+#: ../../mod/content.php:754 ../../object/Item.php:183
 msgid "remove star"
 msgstr "odebrat hvězdu"
 
-#: ../../mod/content.php:738 ../../object/Item.php:184
+#: ../../mod/content.php:755 ../../object/Item.php:184
 msgid "toggle star status"
 msgstr "přepnout hvězdu"
 
-#: ../../mod/content.php:741 ../../object/Item.php:187
+#: ../../mod/content.php:758 ../../object/Item.php:187
 msgid "starred"
 msgstr "označeno hvězdou"
 
-#: ../../mod/content.php:742 ../../object/Item.php:192
+#: ../../mod/content.php:759 ../../object/Item.php:192
 msgid "add tag"
 msgstr "přidat štítek"
 
-#: ../../mod/content.php:746 ../../object/Item.php:122
+#: ../../mod/content.php:763 ../../object/Item.php:122
 msgid "save to folder"
 msgstr "uložit do složky"
 
-#: ../../mod/content.php:819 ../../object/Item.php:237
+#: ../../mod/content.php:854 ../../object/Item.php:254
 msgid "to"
 msgstr "pro"
 
-#: ../../mod/content.php:820 ../../object/Item.php:239
+#: ../../mod/content.php:855 ../../object/Item.php:256
 msgid "Wall-to-Wall"
 msgstr "Zeď-na-Zeď"
 
-#: ../../mod/content.php:821 ../../object/Item.php:240
+#: ../../mod/content.php:856 ../../object/Item.php:257
 msgid "via Wall-To-Wall:"
 msgstr "přes Zeď-na-Zeď "
 
-#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:180
+#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:183
 #: ../../addon.old/communityhome/communityhome.php:179
 #, php-format
 msgid "Welcome to %s"
@@ -1571,13 +1601,13 @@ msgstr "Vítá Vás %s"
 msgid "Invalid request identifier."
 msgstr "Neplatný identifikátor požadavku."
 
-#: ../../mod/notifications.php:35 ../../mod/notifications.php:164
-#: ../../mod/notifications.php:210
+#: ../../mod/notifications.php:35 ../../mod/notifications.php:165
+#: ../../mod/notifications.php:211
 msgid "Discard"
 msgstr "Odstranit"
 
-#: ../../mod/notifications.php:51 ../../mod/notifications.php:163
-#: ../../mod/notifications.php:209 ../../mod/contacts.php:325
+#: ../../mod/notifications.php:51 ../../mod/notifications.php:164
+#: ../../mod/notifications.php:210 ../../mod/contacts.php:325
 #: ../../mod/contacts.php:379
 msgid "Ignore"
 msgstr "Ignorovat"
@@ -1594,7 +1624,7 @@ msgstr "Síť"
 msgid "Personal"
 msgstr "Osobní"
 
-#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87
+#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:88
 #: ../../include/nav.php:77 ../../include/nav.php:116
 msgid "Home"
 msgstr "Domů"
@@ -1616,139 +1646,139 @@ msgstr "Zobrazit ignorované žádosti"
 msgid "Hide Ignored Requests"
 msgstr "Skrýt ignorované žádosti"
 
-#: ../../mod/notifications.php:148 ../../mod/notifications.php:194
+#: ../../mod/notifications.php:149 ../../mod/notifications.php:195
 msgid "Notification type: "
 msgstr "Typ oznámení: "
 
-#: ../../mod/notifications.php:149
+#: ../../mod/notifications.php:150
 msgid "Friend Suggestion"
 msgstr "Návrh přátelství"
 
-#: ../../mod/notifications.php:151
+#: ../../mod/notifications.php:152
 #, php-format
 msgid "suggested by %s"
 msgstr "navrhl %s"
 
-#: ../../mod/notifications.php:156 ../../mod/notifications.php:203
+#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
 #: ../../mod/contacts.php:385
 msgid "Hide this contact from others"
 msgstr "Skrýt tento kontakt před ostatními"
 
-#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
+#: ../../mod/notifications.php:158 ../../mod/notifications.php:205
 msgid "Post a new friend activity"
 msgstr "Zveřejnit aktivitu nového přítele."
 
-#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
+#: ../../mod/notifications.php:158 ../../mod/notifications.php:205
 msgid "if applicable"
 msgstr "je-li použitelné"
 
-#: ../../mod/notifications.php:160 ../../mod/notifications.php:207
-#: ../../mod/admin.php:697
+#: ../../mod/notifications.php:161 ../../mod/notifications.php:208
+#: ../../mod/admin.php:733
 msgid "Approve"
 msgstr "Schválit"
 
-#: ../../mod/notifications.php:180
+#: ../../mod/notifications.php:181
 msgid "Claims to be known to you: "
 msgstr "Vaši údajní známí: "
 
-#: ../../mod/notifications.php:180
+#: ../../mod/notifications.php:181
 msgid "yes"
 msgstr "ano"
 
-#: ../../mod/notifications.php:180
+#: ../../mod/notifications.php:181
 msgid "no"
 msgstr "ne"
 
-#: ../../mod/notifications.php:187
+#: ../../mod/notifications.php:188
 msgid "Approve as: "
 msgstr "Schválit jako: "
 
-#: ../../mod/notifications.php:188
+#: ../../mod/notifications.php:189
 msgid "Friend"
 msgstr "Přítel"
 
-#: ../../mod/notifications.php:189
+#: ../../mod/notifications.php:190
 msgid "Sharer"
 msgstr "Sdílené"
 
-#: ../../mod/notifications.php:189
+#: ../../mod/notifications.php:190
 msgid "Fan/Admirer"
 msgstr "Fanoušek / obdivovatel"
 
-#: ../../mod/notifications.php:195
+#: ../../mod/notifications.php:196
 msgid "Friend/Connect Request"
 msgstr "Přítel / žádost o připojení"
 
-#: ../../mod/notifications.php:195
+#: ../../mod/notifications.php:196
 msgid "New Follower"
 msgstr "Nový následovník"
 
-#: ../../mod/notifications.php:216
+#: ../../mod/notifications.php:217
 msgid "No introductions."
 msgstr "Žádné představení."
 
-#: ../../mod/notifications.php:219 ../../include/nav.php:123
+#: ../../mod/notifications.php:220 ../../include/nav.php:123
 msgid "Notifications"
 msgstr "Upozornění"
 
-#: ../../mod/notifications.php:256 ../../mod/notifications.php:381
-#: ../../mod/notifications.php:468
+#: ../../mod/notifications.php:257 ../../mod/notifications.php:382
+#: ../../mod/notifications.php:469
 #, php-format
 msgid "%s liked %s's post"
 msgstr "Uživateli %s se líbí příspěvek uživatele %s"
 
-#: ../../mod/notifications.php:265 ../../mod/notifications.php:390
-#: ../../mod/notifications.php:477
+#: ../../mod/notifications.php:266 ../../mod/notifications.php:391
+#: ../../mod/notifications.php:478
 #, php-format
 msgid "%s disliked %s's post"
 msgstr "Uživateli %s se nelíbí příspěvek uživatele %s"
 
-#: ../../mod/notifications.php:279 ../../mod/notifications.php:404
-#: ../../mod/notifications.php:491
+#: ../../mod/notifications.php:280 ../../mod/notifications.php:405
+#: ../../mod/notifications.php:492
 #, php-format
 msgid "%s is now friends with %s"
 msgstr "%s se nyní přátelí s %s"
 
-#: ../../mod/notifications.php:286 ../../mod/notifications.php:411
+#: ../../mod/notifications.php:287 ../../mod/notifications.php:412
 #, php-format
 msgid "%s created a new post"
 msgstr "%s vytvořil nový příspěvek"
 
-#: ../../mod/notifications.php:287 ../../mod/notifications.php:412
-#: ../../mod/notifications.php:500
+#: ../../mod/notifications.php:288 ../../mod/notifications.php:413
+#: ../../mod/notifications.php:501
 #, php-format
 msgid "%s commented on %s's post"
 msgstr "%s okomentoval příspěvek uživatele %s'"
 
-#: ../../mod/notifications.php:301
+#: ../../mod/notifications.php:302
 msgid "No more network notifications."
 msgstr "Žádné další síťové upozornění."
 
-#: ../../mod/notifications.php:305
+#: ../../mod/notifications.php:306
 msgid "Network Notifications"
 msgstr "Upozornění Sítě"
 
-#: ../../mod/notifications.php:331 ../../mod/notify.php:61
+#: ../../mod/notifications.php:332 ../../mod/notify.php:61
 msgid "No more system notifications."
 msgstr "Žádné další systémová upozornění."
 
-#: ../../mod/notifications.php:335 ../../mod/notify.php:65
+#: ../../mod/notifications.php:336 ../../mod/notify.php:65
 msgid "System Notifications"
 msgstr "Systémová upozornění"
 
-#: ../../mod/notifications.php:426
+#: ../../mod/notifications.php:427
 msgid "No more personal notifications."
 msgstr "Žádné další osobní upozornění."
 
-#: ../../mod/notifications.php:430
+#: ../../mod/notifications.php:431
 msgid "Personal Notifications"
 msgstr "Osobní upozornění"
 
-#: ../../mod/notifications.php:507
+#: ../../mod/notifications.php:508
 msgid "No more home notifications."
 msgstr "Žádné další domácí upozornění."
 
-#: ../../mod/notifications.php:511
+#: ../../mod/notifications.php:512
 msgid "Home Notifications"
 msgstr "Domácí upozornění"
 
@@ -1845,12 +1875,12 @@ msgid "View all contacts"
 msgstr "Zobrazit všechny kontakty"
 
 #: ../../mod/contacts.php:319 ../../mod/contacts.php:378
-#: ../../mod/admin.php:701
+#: ../../mod/admin.php:737
 msgid "Unblock"
 msgstr "Odblokovat"
 
 #: ../../mod/contacts.php:319 ../../mod/contacts.php:378
-#: ../../mod/admin.php:700
+#: ../../mod/admin.php:736
 msgid "Block"
 msgstr "Blokovat"
 
@@ -1947,7 +1977,7 @@ msgstr "Poslední aktualizace:"
 msgid "Update public posts"
 msgstr "Aktualizovat veřejné příspěvky"
 
-#: ../../mod/contacts.php:375 ../../mod/admin.php:1173
+#: ../../mod/contacts.php:375 ../../mod/admin.php:1209
 msgid "Update now"
 msgstr "Aktualizovat"
 
@@ -1976,7 +2006,7 @@ msgstr "Doporučení"
 msgid "Suggest potential friends"
 msgstr "Navrhnout potenciální přátele"
 
-#: ../../mod/contacts.php:444 ../../mod/group.php:191
+#: ../../mod/contacts.php:444 ../../mod/group.php:194
 msgid "All Contacts"
 msgstr "Všechny kontakty"
 
@@ -2040,8 +2070,8 @@ msgstr "jste fanouškem"
 msgid "Edit contact"
 msgstr "Editovat kontakt"
 
-#: ../../mod/contacts.php:575 ../../view/theme/diabook/theme.php:89
-#: ../../include/nav.php:142
+#: ../../mod/contacts.php:575 ../../view/theme/diabook/theme.php:90
+#: ../../include/nav.php:144
 msgid "Contacts"
 msgstr "Kontakty"
 
@@ -2077,10 +2107,10 @@ msgstr "Na %s bylo zažádáno o resetování hesla"
 #: ../../mod/register.php:91 ../../mod/register.php:145
 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752
 #: ../../addon/facebook/facebook.php:702
-#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:777
+#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:805
 #: ../../addon/public_server/public_server.php:62
-#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3365
-#: ../../boot.php:824 ../../addon.old/facebook/facebook.php:702
+#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3375
+#: ../../boot.php:852 ../../addon.old/facebook/facebook.php:702
 #: ../../addon.old/facebook/facebook.php:1200
 #: ../../addon.old/fbpost/fbpost.php:661
 #: ../../addon.old/public_server/public_server.php:62
@@ -2094,7 +2124,7 @@ msgid ""
 "Password reset failed."
 msgstr "Žádost nemohla být ověřena. (Možná jste ji odeslali již dříve.) Obnovení hesla se nezdařilo."
 
-#: ../../mod/lostpass.php:83 ../../boot.php:963
+#: ../../mod/lostpass.php:83 ../../boot.php:990
 msgid "Password Reset"
 msgstr "Obnovení hesla"
 
@@ -2146,69 +2176,69 @@ msgstr "Další funkčnosti"
 msgid "Missing some important data!"
 msgstr "Chybí některé důležité údaje!"
 
-#: ../../mod/settings.php:121 ../../mod/settings.php:585
+#: ../../mod/settings.php:121 ../../mod/settings.php:586
 msgid "Update"
 msgstr "Aktualizace"
 
-#: ../../mod/settings.php:226
+#: ../../mod/settings.php:227
 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:231
+#: ../../mod/settings.php:232
 msgid "Email settings updated."
 msgstr "Nastavení e-mailu aktualizována."
 
-#: ../../mod/settings.php:246
+#: ../../mod/settings.php:247
 msgid "Features updated"
 msgstr "Aktualizované funkčnosti"
 
-#: ../../mod/settings.php:306
+#: ../../mod/settings.php:307
 msgid "Passwords do not match. Password unchanged."
 msgstr "Hesla se neshodují. Heslo nebylo změněno."
 
-#: ../../mod/settings.php:311
+#: ../../mod/settings.php:312
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Prázdné hesla nejsou povolena. Heslo nebylo změněno."
 
-#: ../../mod/settings.php:322
+#: ../../mod/settings.php:323
 msgid "Password changed."
 msgstr "Heslo bylo změněno."
 
-#: ../../mod/settings.php:324
+#: ../../mod/settings.php:325
 msgid "Password update failed. Please try again."
 msgstr "Aktualizace hesla se nezdařila. Zkuste to prosím znovu."
 
-#: ../../mod/settings.php:389
+#: ../../mod/settings.php:390
 msgid " Please use a shorter name."
 msgstr "Prosím použijte kratší jméno."
 
-#: ../../mod/settings.php:391
+#: ../../mod/settings.php:392
 msgid " Name too short."
 msgstr "Jméno je příliš krátké."
 
-#: ../../mod/settings.php:397
+#: ../../mod/settings.php:398
 msgid " Not valid email."
 msgstr "Neplatný e-mail."
 
-#: ../../mod/settings.php:399
+#: ../../mod/settings.php:400
 msgid " Cannot change to that email."
 msgstr "Nelze provést změnu na tento e-mail."
 
-#: ../../mod/settings.php:453
+#: ../../mod/settings.php:454
 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:457
+#: ../../mod/settings.php:458
 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:487 ../../addon/facebook/facebook.php:495
+#: ../../mod/settings.php:488 ../../addon/facebook/facebook.php:495
 #: ../../addon/fbpost/fbpost.php:151
-#: ../../addon/remote_permissions/remote_permissions.php:204
+#: ../../addon/remote_permissions/remote_permissions.php:205
 #: ../../addon/impressum/impressum.php:78
 #: ../../addon/openstreetmap/openstreetmap.php:80
 #: ../../addon/altpager/altpager.php:107 ../../addon/mathjax/mathjax.php:66
-#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:501
+#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:504
 #: ../../addon.old/facebook/facebook.php:495
 #: ../../addon.old/fbpost/fbpost.php:144
 #: ../../addon.old/impressum/impressum.php:78
@@ -2218,69 +2248,69 @@ msgstr "Soukromé fórum nemá nastaveno zabezpečení a ani žádnou defaultní
 msgid "Settings updated."
 msgstr "Nastavení aktualizováno."
 
-#: ../../mod/settings.php:558 ../../mod/settings.php:584
-#: ../../mod/settings.php:620
+#: ../../mod/settings.php:559 ../../mod/settings.php:585
+#: ../../mod/settings.php:621
 msgid "Add application"
 msgstr "Přidat aplikaci"
 
-#: ../../mod/settings.php:562 ../../mod/settings.php:588
-#: ../../addon/statusnet/statusnet.php:694
+#: ../../mod/settings.php:563 ../../mod/settings.php:589
+#: ../../addon/statusnet/statusnet.php:697
 #: ../../addon.old/statusnet/statusnet.php:570
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
-#: ../../mod/settings.php:563 ../../mod/settings.php:589
-#: ../../addon/statusnet/statusnet.php:693
+#: ../../mod/settings.php:564 ../../mod/settings.php:590
+#: ../../addon/statusnet/statusnet.php:696
 #: ../../addon.old/statusnet/statusnet.php:569
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: ../../mod/settings.php:564 ../../mod/settings.php:590
+#: ../../mod/settings.php:565 ../../mod/settings.php:591
 msgid "Redirect"
 msgstr "Přesměrování"
 
-#: ../../mod/settings.php:565 ../../mod/settings.php:591
+#: ../../mod/settings.php:566 ../../mod/settings.php:592
 msgid "Icon url"
 msgstr "URL ikony"
 
-#: ../../mod/settings.php:576
+#: ../../mod/settings.php:577
 msgid "You can't edit this application."
 msgstr "Nemůžete editovat tuto aplikaci."
 
-#: ../../mod/settings.php:619
+#: ../../mod/settings.php:620
 msgid "Connected Apps"
 msgstr "Připojené aplikace"
 
-#: ../../mod/settings.php:623
+#: ../../mod/settings.php:624
 msgid "Client key starts with"
 msgstr "Klienský klíč začíná"
 
-#: ../../mod/settings.php:624
+#: ../../mod/settings.php:625
 msgid "No name"
 msgstr "Bez názvu"
 
-#: ../../mod/settings.php:625
+#: ../../mod/settings.php:626
 msgid "Remove authorization"
 msgstr "Odstranit oprávnění"
 
-#: ../../mod/settings.php:637
+#: ../../mod/settings.php:638
 msgid "No Plugin settings configured"
 msgstr "Žádný doplněk není nastaven"
 
-#: ../../mod/settings.php:645 ../../addon/widgets/widgets.php:123
+#: ../../mod/settings.php:646 ../../addon/widgets/widgets.php:124
 #: ../../addon.old/widgets/widgets.php:123
 msgid "Plugin Settings"
 msgstr "Nastavení doplňku"
 
-#: ../../mod/settings.php:659
+#: ../../mod/settings.php:660
 msgid "Off"
 msgstr "Vypnuto"
 
-#: ../../mod/settings.php:659
+#: ../../mod/settings.php:660
 msgid "On"
 msgstr "Zapnuto"
 
-#: ../../mod/settings.php:667
+#: ../../mod/settings.php:668
 msgid "Additional Features"
 msgstr "Další Funkčnosti"
 
@@ -2305,369 +2335,369 @@ msgstr "StatusNet"
 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:720
+#: ../../mod/settings.php:721
 msgid "Connector Settings"
 msgstr "Nastavení konektoru"
 
-#: ../../mod/settings.php:725
+#: ../../mod/settings.php:726
 msgid "Email/Mailbox Setup"
 msgstr "Nastavení e-mailu"
 
-#: ../../mod/settings.php:726
+#: ../../mod/settings.php:727
 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:727
+#: ../../mod/settings.php:728
 msgid "Last successful email check:"
 msgstr "Poslední úspěšná kontrola e-mailu:"
 
-#: ../../mod/settings.php:729
+#: ../../mod/settings.php:730
 msgid "IMAP server name:"
 msgstr "jméno IMAP serveru:"
 
-#: ../../mod/settings.php:730
+#: ../../mod/settings.php:731
 msgid "IMAP port:"
 msgstr "IMAP port:"
 
-#: ../../mod/settings.php:731
+#: ../../mod/settings.php:732
 msgid "Security:"
 msgstr "Zabezpečení:"
 
-#: ../../mod/settings.php:731 ../../mod/settings.php:736
+#: ../../mod/settings.php:732 ../../mod/settings.php:737
 #: ../../addon/fbpost/fbpost.php:247 ../../addon/fbpost/fbpost.php:249
 #: ../../addon/dav/common/wdcal_edit.inc.php:191
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:191
 msgid "None"
 msgstr "Žádný"
 
-#: ../../mod/settings.php:732
+#: ../../mod/settings.php:733
 msgid "Email login name:"
 msgstr "přihlašovací jméno k e-mailu:"
 
-#: ../../mod/settings.php:733
+#: ../../mod/settings.php:734
 msgid "Email password:"
 msgstr "heslo k Vašemu e-mailu:"
 
-#: ../../mod/settings.php:734
+#: ../../mod/settings.php:735
 msgid "Reply-to address:"
 msgstr "Odpovědět na adresu:"
 
-#: ../../mod/settings.php:735
+#: ../../mod/settings.php:736
 msgid "Send public posts to all email contacts:"
 msgstr "Poslat veřejné příspěvky na všechny e-mailové kontakty:"
 
-#: ../../mod/settings.php:736
+#: ../../mod/settings.php:737
 msgid "Action after import:"
 msgstr "Akce po importu:"
 
-#: ../../mod/settings.php:736
+#: ../../mod/settings.php:737
 msgid "Mark as seen"
 msgstr "Označit jako přečtené"
 
-#: ../../mod/settings.php:736
+#: ../../mod/settings.php:737
 msgid "Move to folder"
 msgstr "Přesunout do složky"
 
-#: ../../mod/settings.php:737
+#: ../../mod/settings.php:738
 msgid "Move to folder:"
 msgstr "Přesunout do složky:"
 
-#: ../../mod/settings.php:768 ../../mod/admin.php:404
+#: ../../mod/settings.php:769 ../../mod/admin.php:420
 msgid "No special theme for mobile devices"
 msgstr "žádné speciální téma pro mobilní zařízení"
 
-#: ../../mod/settings.php:808
+#: ../../mod/settings.php:809
 msgid "Display Settings"
 msgstr "Nastavení Zobrazení"
 
-#: ../../mod/settings.php:814 ../../mod/settings.php:825
+#: ../../mod/settings.php:815 ../../mod/settings.php:826
 msgid "Display Theme:"
 msgstr "Vybrat grafickou šablonu:"
 
-#: ../../mod/settings.php:815
+#: ../../mod/settings.php:816
 msgid "Mobile Theme:"
 msgstr "Téma pro mobilní zařízení:"
 
-#: ../../mod/settings.php:816
+#: ../../mod/settings.php:817
 msgid "Update browser every xx seconds"
 msgstr "Aktualizovat prohlížeč každých xx sekund"
 
-#: ../../mod/settings.php:816
+#: ../../mod/settings.php:817
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Minimum 10 sekund, žádné maximum."
 
-#: ../../mod/settings.php:817
+#: ../../mod/settings.php:818
 msgid "Number of items to display per page:"
 msgstr "Počet položek zobrazených na stránce:"
 
-#: ../../mod/settings.php:817
+#: ../../mod/settings.php:818
 msgid "Maximum of 100 items"
 msgstr "Maximum 100 položek"
 
-#: ../../mod/settings.php:818
+#: ../../mod/settings.php:819
 msgid "Don't show emoticons"
 msgstr "Nezobrazovat emotikony"
 
-#: ../../mod/settings.php:894
+#: ../../mod/settings.php:895
 msgid "Normal Account Page"
 msgstr "Normální stránka účtu"
 
-#: ../../mod/settings.php:895
+#: ../../mod/settings.php:896
 msgid "This account is a normal personal profile"
 msgstr "Tento účet je běžný osobní profil"
 
-#: ../../mod/settings.php:898
+#: ../../mod/settings.php:899
 msgid "Soapbox Page"
 msgstr "Stránka \"Soapbox\""
 
-#: ../../mod/settings.php:899
+#: ../../mod/settings.php:900
 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:902
+#: ../../mod/settings.php:903
 msgid "Community Forum/Celebrity Account"
 msgstr "Komunitní fórum/ účet celebrity"
 
-#: ../../mod/settings.php:903
+#: ../../mod/settings.php:904
 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:906
+#: ../../mod/settings.php:907
 msgid "Automatic Friend Page"
 msgstr "Automatická stránka přítele"
 
-#: ../../mod/settings.php:907
+#: ../../mod/settings.php:908
 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:910
+#: ../../mod/settings.php:911
 msgid "Private Forum [Experimental]"
 msgstr "Soukromé fórum [Experimentální]"
 
-#: ../../mod/settings.php:911
+#: ../../mod/settings.php:912
 msgid "Private forum - approved members only"
 msgstr "Soukromé fórum - pouze pro schválené členy"
 
-#: ../../mod/settings.php:923
+#: ../../mod/settings.php:924
 msgid "OpenID:"
 msgstr "OpenID:"
 
-#: ../../mod/settings.php:923
+#: ../../mod/settings.php:924
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr "(Volitelné) Povolit OpenID pro přihlášení k tomuto účtu."
 
-#: ../../mod/settings.php:933
+#: ../../mod/settings.php:934
 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:939
+#: ../../mod/settings.php:940
 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:947
+#: ../../mod/settings.php:948
 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:951
+#: ../../mod/settings.php:952
 msgid "Hide your profile details from unknown viewers?"
 msgstr "Skrýt Vaše profilové detaily před neznámými uživateli?"
 
-#: ../../mod/settings.php:956
+#: ../../mod/settings.php:957
 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:962
+#: ../../mod/settings.php:963
 msgid "Allow friends to tag your posts?"
 msgstr "Povolit přátelům označovat Vaše příspěvky?"
 
-#: ../../mod/settings.php:968
+#: ../../mod/settings.php:969
 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:974
+#: ../../mod/settings.php:975
 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:982
+#: ../../mod/settings.php:983
 msgid "Profile is <strong>not published</strong>."
 msgstr "Profil <strong>není zveřejněn</strong>."
 
-#: ../../mod/settings.php:985 ../../mod/profile_photo.php:248
+#: ../../mod/settings.php:986 ../../mod/profile_photo.php:248
 msgid "or"
 msgstr "nebo"
 
-#: ../../mod/settings.php:990
+#: ../../mod/settings.php:991
 msgid "Your Identity Address is"
 msgstr "Vaše adresa identity je"
 
-#: ../../mod/settings.php:1001
+#: ../../mod/settings.php:1002
 msgid "Automatically expire posts after this many days:"
 msgstr "Automaticky expirovat příspěvky po zadaném počtu dní:"
 
-#: ../../mod/settings.php:1001
+#: ../../mod/settings.php:1002
 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:1002
+#: ../../mod/settings.php:1003
 msgid "Advanced expiration settings"
 msgstr "Pokročilé nastavení expirací"
 
-#: ../../mod/settings.php:1003
+#: ../../mod/settings.php:1004
 msgid "Advanced Expiration"
 msgstr "Nastavení expirací"
 
-#: ../../mod/settings.php:1004
+#: ../../mod/settings.php:1005
 msgid "Expire posts:"
 msgstr "Expirovat příspěvky:"
 
-#: ../../mod/settings.php:1005
+#: ../../mod/settings.php:1006
 msgid "Expire personal notes:"
 msgstr "Expirovat osobní poznámky:"
 
-#: ../../mod/settings.php:1006
+#: ../../mod/settings.php:1007
 msgid "Expire starred posts:"
 msgstr "Expirovat příspěvky s hvězdou:"
 
-#: ../../mod/settings.php:1007
+#: ../../mod/settings.php:1008
 msgid "Expire photos:"
 msgstr "Expirovat fotografie:"
 
-#: ../../mod/settings.php:1008
+#: ../../mod/settings.php:1009
 msgid "Only expire posts by others:"
 msgstr "Přízpěvky expirovat pouze ostatními:"
 
-#: ../../mod/settings.php:1015
+#: ../../mod/settings.php:1016
 msgid "Account Settings"
 msgstr "Nastavení účtu"
 
-#: ../../mod/settings.php:1023
+#: ../../mod/settings.php:1024
 msgid "Password Settings"
 msgstr "Nastavení hesla"
 
-#: ../../mod/settings.php:1024
+#: ../../mod/settings.php:1025
 msgid "New Password:"
 msgstr "Nové heslo:"
 
-#: ../../mod/settings.php:1025
+#: ../../mod/settings.php:1026
 msgid "Confirm:"
 msgstr "Potvrďte:"
 
-#: ../../mod/settings.php:1025
+#: ../../mod/settings.php:1026
 msgid "Leave password fields blank unless changing"
 msgstr "Pokud nechcete změnit heslo, položku hesla nevyplňujte"
 
-#: ../../mod/settings.php:1029
+#: ../../mod/settings.php:1030
 msgid "Basic Settings"
 msgstr "Základní nastavení"
 
-#: ../../mod/settings.php:1030 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:1031 ../../include/profile_advanced.php:15
 msgid "Full Name:"
 msgstr "Celé jméno:"
 
-#: ../../mod/settings.php:1031
+#: ../../mod/settings.php:1032
 msgid "Email Address:"
 msgstr "E-mailová adresa:"
 
-#: ../../mod/settings.php:1032
+#: ../../mod/settings.php:1033
 msgid "Your Timezone:"
 msgstr "Vaše časové pásmo:"
 
-#: ../../mod/settings.php:1033
+#: ../../mod/settings.php:1034
 msgid "Default Post Location:"
 msgstr "Výchozí umístění příspěvků:"
 
-#: ../../mod/settings.php:1034
+#: ../../mod/settings.php:1035
 msgid "Use Browser Location:"
 msgstr "Používat umístění dle prohlížeče:"
 
-#: ../../mod/settings.php:1037
+#: ../../mod/settings.php:1038
 msgid "Security and Privacy Settings"
 msgstr "Nastavení zabezpečení a soukromí"
 
-#: ../../mod/settings.php:1039
+#: ../../mod/settings.php:1040
 msgid "Maximum Friend Requests/Day:"
 msgstr "Maximální počet žádostí o přátelství za den:"
 
-#: ../../mod/settings.php:1039 ../../mod/settings.php:1058
+#: ../../mod/settings.php:1040 ../../mod/settings.php:1059
 msgid "(to prevent spam abuse)"
 msgstr "(Aby se zabránilo spamu)"
 
-#: ../../mod/settings.php:1040
+#: ../../mod/settings.php:1041
 msgid "Default Post Permissions"
 msgstr "Výchozí oprávnění pro příspěvek"
 
-#: ../../mod/settings.php:1041
+#: ../../mod/settings.php:1042
 msgid "(click to open/close)"
 msgstr "(Klikněte pro otevření/zavření)"
 
-#: ../../mod/settings.php:1058
+#: ../../mod/settings.php:1059
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Maximum soukromých zpráv od neznámých lidí:"
 
-#: ../../mod/settings.php:1061
+#: ../../mod/settings.php:1062
 msgid "Notification Settings"
 msgstr "Nastavení notifikací"
 
-#: ../../mod/settings.php:1062
+#: ../../mod/settings.php:1063
 msgid "By default post a status message when:"
 msgstr "Defaultně posílat statusové zprávy když:"
 
-#: ../../mod/settings.php:1063
+#: ../../mod/settings.php:1064
 msgid "accepting a friend request"
 msgstr "akceptuji požadavek na přátelství"
 
-#: ../../mod/settings.php:1064
+#: ../../mod/settings.php:1065
 msgid "joining a forum/community"
 msgstr "připojující se k fóru/komunitě"
 
-#: ../../mod/settings.php:1065
+#: ../../mod/settings.php:1066
 msgid "making an <em>interesting</em> profile change"
 msgstr "provedení <em>zajímavé</em> profilové změny"
 
-#: ../../mod/settings.php:1066
+#: ../../mod/settings.php:1067
 msgid "Send a notification email when:"
 msgstr "Poslat notifikaci e-mailem, když"
 
-#: ../../mod/settings.php:1067
+#: ../../mod/settings.php:1068
 msgid "You receive an introduction"
 msgstr "obdržíte žádost o propojení"
 
-#: ../../mod/settings.php:1068
+#: ../../mod/settings.php:1069
 msgid "Your introductions are confirmed"
 msgstr "Vaše žádosti jsou potvrzeny"
 
-#: ../../mod/settings.php:1069
+#: ../../mod/settings.php:1070
 msgid "Someone writes on your profile wall"
 msgstr "někdo Vám napíše na Vaši profilovou stránku"
 
-#: ../../mod/settings.php:1070
+#: ../../mod/settings.php:1071
 msgid "Someone writes a followup comment"
 msgstr "někdo Vám napíše následný komentář"
 
-#: ../../mod/settings.php:1071
+#: ../../mod/settings.php:1072
 msgid "You receive a private message"
 msgstr "obdržíte soukromou zprávu"
 
-#: ../../mod/settings.php:1072
+#: ../../mod/settings.php:1073
 msgid "You receive a friend suggestion"
 msgstr "Obdržel jste návrh přátelství"
 
-#: ../../mod/settings.php:1073
+#: ../../mod/settings.php:1074
 msgid "You are tagged in a post"
 msgstr "Jste označen v příspěvku"
 
-#: ../../mod/settings.php:1074
+#: ../../mod/settings.php:1075
 msgid "You are poked/prodded/etc. in a post"
 msgstr "Byl Jste šťouchnout v příspěvku"
 
-#: ../../mod/settings.php:1077
+#: ../../mod/settings.php:1078
 msgid "Advanced Account/Page Type Settings"
 msgstr "Pokročilé nastavení účtu/stránky"
 
-#: ../../mod/settings.php:1078
+#: ../../mod/settings.php:1079
 msgid "Change the behaviour of this account for special situations"
 msgstr "Změnit chování tohoto účtu ve speciálních situacích"
 
@@ -2771,16 +2801,16 @@ msgstr "Soukromé zprávy této osobě jsou vystaveny riziku prozrazení."
 msgid "Invalid contact."
 msgstr "Neplatný kontakt."
 
-#: ../../mod/notes.php:44 ../../boot.php:1755
+#: ../../mod/notes.php:44 ../../boot.php:1798
 msgid "Personal Notes"
 msgstr "Osobní poznámky"
 
-#: ../../mod/notes.php:63 ../../mod/filer.php:30
+#: ../../mod/notes.php:63 ../../mod/filer.php:31
 #: ../../addon/facebook/facebook.php:770
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:281
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:346
 #: ../../addon/fbpost/fbpost.php:314
 #: ../../addon/dav/friendica/layout.fnk.php:441
-#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:688
+#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:742
 #: ../../addon.old/facebook/facebook.php:770
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:263
 #: ../../addon.old/fbpost/fbpost.php:267
@@ -2804,11 +2834,21 @@ msgid "Move account"
 msgstr "Přesunout účet"
 
 #: ../../mod/uimport.php:67
+msgid "You can import an account from another Friendica server."
+msgstr "Můžete importovat účet z jiného Friendica serveru."
+
+#: ../../mod/uimport.php:68
 msgid ""
-"You can import an account from another Friendica server. <br>\r\n"
-"                            You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here.<br>\r\n"
-"                            <b>This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from diaspora"
-msgstr "Je možné  importovat účet z jiného Friendica serveru. <br>\nPotřebujete exportovat Váš účet ze starého serveru a importovat ho zde. My následně znovu vytvoříme Váš účet zde se všemi Vašimi kontakty. Také se pokusíme informovat všechny Vaše přátele o tom, že jste se sem přesunuli.<br>\n<b>Tato funkčnost je experimentální. Nemůžeme importovat kontakty ze sítě OStatus (statusnet/identi.ca) nebo z diaspory."
+"You need to export your account from the old server and upload it here. We "
+"will recreate your old account here with all your contacts. We will try also"
+" to inform your friends that you moved here."
+msgstr "Musíte exportovat svůj účet na sterém serveru a nahrát ho zde. My následně vytvoříme Váš původní účet zde včetně všech kontaktů. Zároveň se pokusíme informovat všechny Vaše přátele, že jste se sem přestěhovali."
+
+#: ../../mod/uimport.php:69
+msgid ""
+"This feature is experimental. We can't import contacts from the OStatus "
+"network (statusnet/identi.ca) or from Diaspora"
+msgstr "Tato funkčnost je experimentální. Nemůžeme importovat kontakty z OSStatus sítí (statusnet/identi.ca) nebo z Diaspory"
 
 #: ../../mod/uimport.php:70
 msgid "Account file"
@@ -2851,7 +2891,8 @@ msgstr "Žádný příjemce."
 
 #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
 #: ../../mod/message.php:249 ../../mod/message.php:257
-#: ../../include/conversation.php:905 ../../include/conversation.php:923
+#: ../../mod/message.php:429 ../../mod/message.php:437
+#: ../../include/conversation.php:941 ../../include/conversation.php:959
 msgid "Please enter a link URL:"
 msgstr "Zadejte prosím URL odkaz:"
 
@@ -2867,17 +2908,17 @@ msgid ""
 msgstr "Pokud si přejete, aby uživatel %s mohl odpovědět, ověřte si zda-li máte povoleno na svém serveru zasílání soukromých zpráv od neznámých odesilatelů."
 
 #: ../../mod/wallmessage.php:140 ../../mod/message.php:286
-#: ../../mod/message.php:476
+#: ../../mod/message.php:516
 msgid "To:"
 msgstr "Adresát:"
 
 #: ../../mod/wallmessage.php:141 ../../mod/message.php:291
-#: ../../mod/message.php:478
+#: ../../mod/message.php:518
 msgid "Subject:"
 msgstr "Předmět:"
 
 #: ../../mod/wallmessage.php:147 ../../mod/message.php:295
-#: ../../mod/message.php:481 ../../mod/invite.php:113
+#: ../../mod/message.php:521 ../../mod/invite.php:113
 msgid "Your message:"
 msgstr "Vaše zpráva:"
 
@@ -2932,9 +2973,9 @@ msgid ""
 msgstr "Prohlédněte si další nastavení, a to zejména nastavení soukromí. Nezveřejnění svého účtu v adresáři je jako mít nezveřejněné telefonní číslo. Obecně platí, že je lepší mít svůj účet zveřejněný, leda by všichni vaši potenciální přátelé věděli, jak vás přesně najít."
 
 #: ../../mod/newmember.php:32 ../../mod/profperm.php:103
-#: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7
+#: ../../view/theme/diabook/theme.php:89 ../../include/profile_advanced.php:7
 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50
-#: ../../boot.php:1731
+#: ../../boot.php:1774
 msgid "Profile"
 msgstr "Profil"
 
@@ -3097,7 +3138,7 @@ msgstr "Skupina vytvořena."
 msgid "Could not create group."
 msgstr "Nelze vytvořit skupinu."
 
-#: ../../mod/group.php:47 ../../mod/group.php:137
+#: ../../mod/group.php:47 ../../mod/group.php:140
 msgid "Group not found."
 msgstr "Skupina nenalezena."
 
@@ -3109,31 +3150,31 @@ msgstr "Název skupiny byl změněn."
 msgid "Permission denied"
 msgstr "Nedostatečné oprávnění"
 
-#: ../../mod/group.php:90
+#: ../../mod/group.php:93
 msgid "Create a group of contacts/friends."
 msgstr "Vytvořit skupinu kontaktů / přátel."
 
-#: ../../mod/group.php:91 ../../mod/group.php:177
+#: ../../mod/group.php:94 ../../mod/group.php:180
 msgid "Group Name: "
 msgstr "Název skupiny: "
 
-#: ../../mod/group.php:110
+#: ../../mod/group.php:113
 msgid "Group removed."
 msgstr "Skupina odstraněna. "
 
-#: ../../mod/group.php:112
+#: ../../mod/group.php:115
 msgid "Unable to remove group."
 msgstr "Nelze odstranit skupinu."
 
-#: ../../mod/group.php:176
+#: ../../mod/group.php:179
 msgid "Group Editor"
 msgstr "Editor skupin"
 
-#: ../../mod/group.php:189
+#: ../../mod/group.php:192
 msgid "Members"
 msgstr "Členové"
 
-#: ../../mod/group.php:221 ../../mod/profperm.php:105
+#: ../../mod/group.php:223 ../../mod/profperm.php:105
 msgid "Click on a contact to add or remove."
 msgstr "Klikněte na kontakt pro přidání nebo odebrání"
 
@@ -3157,7 +3198,7 @@ msgstr "Všechny kontakty (se zabezpečeným přístupovým profilem )"
 msgid "No contacts."
 msgstr "Žádné kontakty."
 
-#: ../../mod/viewcontacts.php:76 ../../include/text.php:625
+#: ../../mod/viewcontacts.php:76 ../../include/text.php:679
 msgid "View Contacts"
 msgstr "Zobrazit kontakty"
 
@@ -3208,38 +3249,38 @@ msgstr "Vaše OpenID (nepovinné): "
 msgid "Include your profile in member directory?"
 msgstr "Toto je Váš <strong>veřejný</strong> profil.<br />Ten <strong>může</strong> být viditelný kýmkoliv na internetu."
 
-#: ../../mod/register.php:256
+#: ../../mod/register.php:255
 msgid "Membership on this site is by invitation only."
 msgstr "Členství na tomto webu je pouze na pozvání."
 
-#: ../../mod/register.php:257
+#: ../../mod/register.php:256
 msgid "Your invitation ID: "
 msgstr "Vaše pozvání ID:"
 
-#: ../../mod/register.php:260 ../../mod/admin.php:446
+#: ../../mod/register.php:259 ../../mod/admin.php:462
 msgid "Registration"
 msgstr "Registrace"
 
-#: ../../mod/register.php:268
+#: ../../mod/register.php:267
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr "Vaše celé jméno (např. Jan Novák):"
 
-#: ../../mod/register.php:269
+#: ../../mod/register.php:268
 msgid "Your Email Address: "
 msgstr "Vaše e-mailová adresa:"
 
-#: ../../mod/register.php:270
+#: ../../mod/register.php:269
 msgid ""
 "Choose a profile nickname. This must begin with a text character. Your "
 "profile address on this site will then be "
 "'<strong>nickname@$sitename</strong>'."
 msgstr "Vyberte přezdívku k profilu. Ta musí začít s textovým znakem. Vaše profilová adresa na tomto webu pak bude \"<strong>přezdívka@$sitename</strong>\"."
 
-#: ../../mod/register.php:271
+#: ../../mod/register.php:270
 msgid "Choose a nickname: "
 msgstr "Vyberte přezdívku:"
 
-#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:923
+#: ../../mod/register.php:273 ../../include/nav.php:81 ../../boot.php:951
 msgid "Register"
 msgstr "Registrovat"
 
@@ -3248,9 +3289,9 @@ msgid "People Search"
 msgstr "Vyhledávání lidí"
 
 #: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62
-#: ../../addon/communityhome/communityhome.php:164
-#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1442
-#: ../../include/diaspora.php:1848 ../../include/conversation.php:125
+#: ../../addon/communityhome/communityhome.php:166
+#: ../../view/theme/diabook/theme.php:465 ../../include/text.php:1499
+#: ../../include/diaspora.php:1851 ../../include/conversation.php:125
 #: ../../include/conversation.php:253
 #: ../../addon.old/communityhome/communityhome.php:163
 msgid "photo"
@@ -3258,10 +3299,10 @@ msgstr "fotografie"
 
 #: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/subthread.php:87
 #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598
-#: ../../addon/communityhome/communityhome.php:159
-#: ../../addon/communityhome/communityhome.php:168
-#: ../../view/theme/diabook/theme.php:459
-#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1848
+#: ../../addon/communityhome/communityhome.php:161
+#: ../../addon/communityhome/communityhome.php:170
+#: ../../view/theme/diabook/theme.php:460
+#: ../../view/theme/diabook/theme.php:469 ../../include/diaspora.php:1851
 #: ../../include/conversation.php:120 ../../include/conversation.php:129
 #: ../../include/conversation.php:248 ../../include/conversation.php:257
 #: ../../addon.old/facebook/facebook.php:1598
@@ -3271,8 +3312,8 @@ msgid "status"
 msgstr "Stav"
 
 #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602
-#: ../../addon/communityhome/communityhome.php:173
-#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1864
+#: ../../addon/communityhome/communityhome.php:175
+#: ../../view/theme/diabook/theme.php:474 ../../include/diaspora.php:1867
 #: ../../include/conversation.php:136
 #: ../../addon.old/facebook/facebook.php:1602
 #: ../../addon.old/communityhome/communityhome.php:172
@@ -3286,8 +3327,8 @@ msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s nemá rád %2$s na %3$s"
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
-#: ../../mod/admin.php:737 ../../mod/admin.php:936 ../../mod/display.php:39
-#: ../../mod/display.php:169 ../../include/items.php:3843
+#: ../../mod/admin.php:773 ../../mod/admin.php:972 ../../mod/display.php:39
+#: ../../mod/display.php:169 ../../include/items.php:3853
 msgid "Item not found."
 msgstr "Položka nenalezena."
 
@@ -3295,12 +3336,12 @@ msgstr "Položka nenalezena."
 msgid "Access denied."
 msgstr "Přístup odmítnut"
 
-#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90
-#: ../../include/nav.php:51 ../../boot.php:1738
+#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:91
+#: ../../include/nav.php:51 ../../boot.php:1781
 msgid "Photos"
 msgstr "Fotografie"
 
-#: ../../mod/fbrowser.php:96
+#: ../../mod/fbrowser.php:113
 msgid "Files"
 msgstr "Soubory"
 
@@ -3487,15 +3528,15 @@ msgstr "Vy a %s"
 msgid "%s and You"
 msgstr "%s a Vy"
 
-#: ../../mod/message.php:357 ../../mod/message.php:469
+#: ../../mod/message.php:368 ../../mod/message.php:509
 msgid "Delete conversation"
 msgstr "Odstranit konverzaci"
 
-#: ../../mod/message.php:360
+#: ../../mod/message.php:371
 msgid "D, d M Y - g:i A"
 msgstr "D M R - g:i A"
 
-#: ../../mod/message.php:363
+#: ../../mod/message.php:374
 #, php-format
 msgid "%d message"
 msgid_plural "%d messages"
@@ -3503,21 +3544,21 @@ msgstr[0] "%d zpráva"
 msgstr[1] "%d zprávy"
 msgstr[2] "%d zpráv"
 
-#: ../../mod/message.php:398
+#: ../../mod/message.php:413
 msgid "Message not available."
 msgstr "Zpráva není k dispozici."
 
-#: ../../mod/message.php:451
+#: ../../mod/message.php:483
 msgid "Delete message"
 msgstr "Smazat zprávu"
 
-#: ../../mod/message.php:471
+#: ../../mod/message.php:511
 msgid ""
 "No secure communications available. You <strong>may</strong> be able to "
 "respond from the sender's profile page."
 msgstr "Není k dispozici zabezpečená komunikace. <strong>Možná</strong> budete schopni reagovat z odesilatelovy profilové stránky."
 
-#: ../../mod/message.php:475
+#: ../../mod/message.php:515
 msgid "Send Reply"
 msgstr "Poslat odpověď"
 
@@ -3534,19 +3575,19 @@ msgstr "Žádní přátelé k zobrazení"
 msgid "Theme settings updated."
 msgstr "Nastavení téma zobrazení bylo aktualizováno."
 
-#: ../../mod/admin.php:96 ../../mod/admin.php:444
+#: ../../mod/admin.php:96 ../../mod/admin.php:460
 msgid "Site"
 msgstr "Web"
 
-#: ../../mod/admin.php:97 ../../mod/admin.php:691 ../../mod/admin.php:704
+#: ../../mod/admin.php:97 ../../mod/admin.php:727 ../../mod/admin.php:740
 msgid "Users"
 msgstr "Uživatelé"
 
-#: ../../mod/admin.php:98 ../../mod/admin.php:786 ../../mod/admin.php:828
+#: ../../mod/admin.php:98 ../../mod/admin.php:822 ../../mod/admin.php:864
 msgid "Plugins"
 msgstr "Pluginy"
 
-#: ../../mod/admin.php:99 ../../mod/admin.php:991 ../../mod/admin.php:1027
+#: ../../mod/admin.php:99 ../../mod/admin.php:1027 ../../mod/admin.php:1063
 msgid "Themes"
 msgstr "Témata"
 
@@ -3554,11 +3595,11 @@ msgstr "Témata"
 msgid "DB updates"
 msgstr "Aktualizace databáze"
 
-#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1114
+#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1150
 msgid "Logs"
 msgstr "Logy"
 
-#: ../../mod/admin.php:120 ../../include/nav.php:149
+#: ../../mod/admin.php:120 ../../include/nav.php:151
 msgid "Admin"
 msgstr "Administrace"
 
@@ -3570,19 +3611,19 @@ msgstr "Funkčnosti rozšíření"
 msgid "User registrations waiting for confirmation"
 msgstr "Registrace uživatele čeká na potvrzení"
 
-#: ../../mod/admin.php:183 ../../mod/admin.php:672
+#: ../../mod/admin.php:183 ../../mod/admin.php:698
 msgid "Normal Account"
 msgstr "Normální účet"
 
-#: ../../mod/admin.php:184 ../../mod/admin.php:673
+#: ../../mod/admin.php:184 ../../mod/admin.php:699
 msgid "Soapbox Account"
 msgstr "Soapbox účet"
 
-#: ../../mod/admin.php:185 ../../mod/admin.php:674
+#: ../../mod/admin.php:185 ../../mod/admin.php:700
 msgid "Community/Celebrity Account"
 msgstr "Komunitní účet / Účet celebrity"
 
-#: ../../mod/admin.php:186 ../../mod/admin.php:675
+#: ../../mod/admin.php:186 ../../mod/admin.php:701
 msgid "Automatic Friend Account"
 msgstr "Účet s automatickým schvalováním přátel"
 
@@ -3598,9 +3639,9 @@ msgstr "Soukromé fórum"
 msgid "Message queues"
 msgstr "Fronty zpráv"
 
-#: ../../mod/admin.php:212 ../../mod/admin.php:443 ../../mod/admin.php:690
-#: ../../mod/admin.php:785 ../../mod/admin.php:827 ../../mod/admin.php:990
-#: ../../mod/admin.php:1026 ../../mod/admin.php:1113
+#: ../../mod/admin.php:212 ../../mod/admin.php:459 ../../mod/admin.php:726
+#: ../../mod/admin.php:821 ../../mod/admin.php:863 ../../mod/admin.php:1026
+#: ../../mod/admin.php:1062 ../../mod/admin.php:1149
 msgid "Administration"
 msgstr "Administrace"
 
@@ -3624,391 +3665,439 @@ msgstr "Verze"
 msgid "Active plugins"
 msgstr "Aktivní pluginy"
 
-#: ../../mod/admin.php:375
+#: ../../mod/admin.php:391
 msgid "Site settings updated."
 msgstr "Nastavení webu aktualizováno."
 
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:446
 msgid "Closed"
 msgstr "Uzavřeno"
 
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:447
 msgid "Requires approval"
 msgstr "Vyžaduje schválení"
 
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:448
 msgid "Open"
 msgstr "Otevřená"
 
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:452
 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:437
+#: ../../mod/admin.php:453
 msgid "Force all links to use SSL"
 msgstr "Vyžadovat u všech odkazů použití SSL"
 
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:454
 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:447
+#: ../../mod/admin.php:463
 msgid "File upload"
 msgstr "Nahrání souborů"
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:464
 msgid "Policies"
 msgstr "Politiky"
 
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:465
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: ../../mod/admin.php:453 ../../addon/statusnet/statusnet.php:691
+#: ../../mod/admin.php:466
+msgid "Performance"
+msgstr "Výkonnost"
+
+#: ../../mod/admin.php:470 ../../addon/statusnet/statusnet.php:694
 #: ../../addon.old/statusnet/statusnet.php:567
 msgid "Site name"
 msgstr "Název webu"
 
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:471
 msgid "Banner/Logo"
 msgstr "Banner/logo"
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:472
 msgid "System language"
 msgstr "Systémový jazyk"
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:473
 msgid "System theme"
 msgstr "Grafická šablona systému "
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:473
 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:457
+#: ../../mod/admin.php:474
 msgid "Mobile system theme"
 msgstr "Systémové téma zobrazení pro mobilní zařízení"
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:474
 msgid "Theme for mobile devices"
 msgstr "Téma zobrazení pro mobilní zařízení"
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:475
 msgid "SSL link policy"
 msgstr "Politika SSL odkazů"
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:475
 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:459
+#: ../../mod/admin.php:476
+msgid "'Share' element"
+msgstr "Element \"Sdílet\""
+
+#: ../../mod/admin.php:476
+msgid "Activates the bbcode element 'share' for repeating items."
+msgstr "Aktivuje bbcode prvek 'share' pro opakované položky."
+
+#: ../../mod/admin.php:477
 msgid "Maximum image size"
 msgstr "Maximální velikost obrázků"
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:477
 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:460
+#: ../../mod/admin.php:478
 msgid "Maximum image length"
 msgstr "Maximální velikost obrázků"
 
-#: ../../mod/admin.php:460
+#: ../../mod/admin.php:478
 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:461
+#: ../../mod/admin.php:479
 msgid "JPEG image quality"
 msgstr "JPEG kvalita obrázku"
 
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:479
 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:463
+#: ../../mod/admin.php:481
 msgid "Register policy"
 msgstr "Politika registrace"
 
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:482
 msgid "Maximum Daily Registrations"
 msgstr "Maximální počet denních registrací"
 
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:482
 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:465
+#: ../../mod/admin.php:483
 msgid "Register text"
 msgstr "Registrace textu"
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:483
 msgid "Will be displayed prominently on the registration page."
 msgstr "Bude zřetelně zobrazeno na registrační stránce."
 
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:484
 msgid "Accounts abandoned after x days"
 msgstr "Účet je opuštěn po x dnech"
 
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:484
 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:467
+#: ../../mod/admin.php:485
 msgid "Allowed friend domains"
 msgstr "Povolené domény přátel"
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:485
 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:468
+#: ../../mod/admin.php:486
 msgid "Allowed email domains"
 msgstr "Povolené e-mailové domény"
 
-#: ../../mod/admin.php:468
+#: ../../mod/admin.php:486
 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:469
+#: ../../mod/admin.php:487
 msgid "Block public"
 msgstr "Blokovat veřejnost"
 
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:487
 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:470
+#: ../../mod/admin.php:488
 msgid "Force publish"
 msgstr "Publikovat"
 
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:488
 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:471
+#: ../../mod/admin.php:489
 msgid "Global directory update URL"
 msgstr "aktualizace URL adresy Globálního adresáře "
 
-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:489
 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:472
+#: ../../mod/admin.php:490
 msgid "Allow threaded items"
 msgstr "Povolit vícevláknové zpracování obsahu"
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:490
 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:473
+#: ../../mod/admin.php:491
 msgid "Private posts by default for new users"
 msgstr "Nastavit pro nové uživatele příspěvky jako soukromé"
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:491
 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:475
+#: ../../mod/admin.php:493
 msgid "Block multiple registrations"
 msgstr "Blokovat více registrací"
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:493
 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:476
+#: ../../mod/admin.php:494
 msgid "OpenID support"
 msgstr "podpora OpenID"
 
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:494
 msgid "OpenID support for registration and logins."
 msgstr "Podpora OpenID pro registraci a přihlašování."
 
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:495
 msgid "Fullname check"
 msgstr "kontrola úplného jména"
 
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:495
 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:478
+#: ../../mod/admin.php:496
 msgid "UTF-8 Regular expressions"
 msgstr "UTF-8 Regulární výrazy"
 
-#: ../../mod/admin.php:478
+#: ../../mod/admin.php:496
 msgid "Use PHP UTF8 regular expressions"
 msgstr "Použít PHP UTF8 regulární výrazy."
 
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:497
 msgid "Show Community Page"
 msgstr "Zobrazit stránku komunity"
 
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:497
 msgid ""
 "Display a Community page showing all recent public postings on this site."
 msgstr "Zobrazit Komunitní stránku zobrazující všechny veřejné příspěvky napsané na této stránce."
 
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:498
 msgid "Enable OStatus support"
 msgstr "Zapnout podporu OStatus"
 
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:498
 msgid ""
 "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All "
 "communications in OStatus are public, so privacy warnings will be "
 "occasionally displayed."
 msgstr "Poskytnout zabudouvanou kompatibilitu s OStatus (identi.ca, status.net, etc.). Veškerá komunikace s OStatus je veřejná, proto bude občas zobrazeno upozornění."
 
-#: ../../mod/admin.php:481
+#: ../../mod/admin.php:499
 msgid "Enable Diaspora support"
 msgstr "Povolit podporu Diaspora"
 
-#: ../../mod/admin.php:481
+#: ../../mod/admin.php:499
 msgid "Provide built-in Diaspora network compatibility."
 msgstr "Poskytnout zabudovanou kompatibilitu sitě Diaspora."
 
-#: ../../mod/admin.php:482
+#: ../../mod/admin.php:500
 msgid "Only allow Friendica contacts"
 msgstr "Povolit pouze Friendica kontakty"
 
-#: ../../mod/admin.php:482
+#: ../../mod/admin.php:500
 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:483
+#: ../../mod/admin.php:501
 msgid "Verify SSL"
 msgstr "Ověřit SSL"
 
-#: ../../mod/admin.php:483
+#: ../../mod/admin.php:501
 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:484
+#: ../../mod/admin.php:502
 msgid "Proxy user"
 msgstr "Proxy uživatel"
 
-#: ../../mod/admin.php:485
+#: ../../mod/admin.php:503
 msgid "Proxy URL"
 msgstr "Proxy URL adresa"
 
-#: ../../mod/admin.php:486
+#: ../../mod/admin.php:504
 msgid "Network timeout"
 msgstr "čas síťového spojení vypršelo (timeout)"
 
-#: ../../mod/admin.php:486
+#: ../../mod/admin.php:504
 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:487
+#: ../../mod/admin.php:505
 msgid "Delivery interval"
 msgstr "Interval doručování"
 
-#: ../../mod/admin.php:487
+#: ../../mod/admin.php:505
 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:488
+#: ../../mod/admin.php:506
 msgid "Poll interval"
 msgstr "Dotazovací interval"
 
-#: ../../mod/admin.php:488
+#: ../../mod/admin.php:506
 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:489
+#: ../../mod/admin.php:507
 msgid "Maximum Load Average"
 msgstr "Maximální průměrné zatížení"
 
-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:507
 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:506
+#: ../../mod/admin.php:509
+msgid "Use MySQL full text engine"
+msgstr "Použít fulltextový vyhledávací stroj MySQL"
+
+#: ../../mod/admin.php:509
+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:510
+msgid "Path to item cache"
+msgstr "Cesta k položkám vyrovnávací paměti"
+
+#: ../../mod/admin.php:511
+msgid "Cache duration in seconds"
+msgstr "Doba platnosti vyrovnávací paměti v sekundách"
+
+#: ../../mod/admin.php:511
+msgid ""
+"How long should the cache files be hold? Default value is 86400 seconds (One"
+" day)."
+msgstr "Jak dlouho by měla vyrovnávací paměť držet data? Výchozí hodnota je 86400 sekund (Jeden den)."
+
+#: ../../mod/admin.php:512
+msgid "Path for lock file"
+msgstr "Cesta k souboru zámku"
+
+#: ../../mod/admin.php:513
+msgid "Temp path"
+msgstr "Cesta k dočasným souborům"
+
+#: ../../mod/admin.php:514
+msgid "Base path to installation"
+msgstr "Základní cesta k instalaci"
+
+#: ../../mod/admin.php:532
 msgid "Update has been marked successful"
 msgstr "Aktualizace byla označena jako úspěšná."
 
-#: ../../mod/admin.php:516
+#: ../../mod/admin.php:542
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr "Vykonávání %s selhalo. Zkontrolujte chybový protokol."
 
-#: ../../mod/admin.php:519
+#: ../../mod/admin.php:545
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "Aktualizace %s byla úspěšně aplikována."
 
-#: ../../mod/admin.php:523
+#: ../../mod/admin.php:549
 #, 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:526
+#: ../../mod/admin.php:552
 #, php-format
 msgid "Update function %s could not be found."
 msgstr "Aktualizační funkce %s nebyla nalezena."
 
-#: ../../mod/admin.php:541
+#: ../../mod/admin.php:567
 msgid "No failed updates."
 msgstr "Žádné neúspěšné aktualizace."
 
-#: ../../mod/admin.php:545
+#: ../../mod/admin.php:571
 msgid "Failed Updates"
 msgstr "Neúspěšné aktualizace"
 
-#: ../../mod/admin.php:546
+#: ../../mod/admin.php:572
 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:547
+#: ../../mod/admin.php:573
 msgid "Mark success (if update was manually applied)"
 msgstr "Označit za úspěšné (pokud byla aktualizace aplikována manuálně)"
 
-#: ../../mod/admin.php:548
+#: ../../mod/admin.php:574
 msgid "Attempt to execute this update step automatically"
 msgstr "Pokusit se provést tuto aktualizaci automaticky."
 
-#: ../../mod/admin.php:573
+#: ../../mod/admin.php:599
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
@@ -4016,7 +4105,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:580
+#: ../../mod/admin.php:606
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
@@ -4024,180 +4113,180 @@ msgstr[0] "%s uživatel smazán"
 msgstr[1] "%s uživatelů smazáno"
 msgstr[2] "%s uživatelů smazáno"
 
-#: ../../mod/admin.php:619
+#: ../../mod/admin.php:645
 #, php-format
 msgid "User '%s' deleted"
 msgstr "Uživatel '%s' smazán"
 
-#: ../../mod/admin.php:627
+#: ../../mod/admin.php:653
 #, php-format
 msgid "User '%s' unblocked"
 msgstr "Uživatel '%s' odblokován"
 
-#: ../../mod/admin.php:627
+#: ../../mod/admin.php:653
 #, php-format
 msgid "User '%s' blocked"
 msgstr "Uživatel '%s' blokován"
 
-#: ../../mod/admin.php:693
+#: ../../mod/admin.php:729
 msgid "select all"
 msgstr "Vybrat vše"
 
-#: ../../mod/admin.php:694
+#: ../../mod/admin.php:730
 msgid "User registrations waiting for confirm"
 msgstr "Registrace uživatele čeká na potvrzení"
 
-#: ../../mod/admin.php:695
+#: ../../mod/admin.php:731
 msgid "Request date"
 msgstr "Datum žádosti"
 
-#: ../../mod/admin.php:695 ../../mod/admin.php:705
+#: ../../mod/admin.php:731 ../../mod/admin.php:741
 #: ../../include/contact_selectors.php:79
 #: ../../include/contact_selectors.php:86
 msgid "Email"
 msgstr "E-mail"
 
-#: ../../mod/admin.php:696
+#: ../../mod/admin.php:732
 msgid "No registrations."
 msgstr "Žádné registrace."
 
-#: ../../mod/admin.php:698
+#: ../../mod/admin.php:734
 msgid "Deny"
 msgstr "Odmítnout"
 
-#: ../../mod/admin.php:702
+#: ../../mod/admin.php:738
 msgid "Site admin"
 msgstr "Site administrátor"
 
-#: ../../mod/admin.php:705
+#: ../../mod/admin.php:741
 msgid "Register date"
 msgstr "Datum registrace"
 
-#: ../../mod/admin.php:705
+#: ../../mod/admin.php:741
 msgid "Last login"
 msgstr "Datum posledního přihlášení"
 
-#: ../../mod/admin.php:705
+#: ../../mod/admin.php:741
 msgid "Last item"
 msgstr "Poslední položka"
 
-#: ../../mod/admin.php:705
+#: ../../mod/admin.php:741
 msgid "Account"
 msgstr "Účet"
 
-#: ../../mod/admin.php:707
+#: ../../mod/admin.php:743
 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:708
+#: ../../mod/admin.php:744
 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:749
+#: ../../mod/admin.php:785
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Plugin %s zakázán."
 
-#: ../../mod/admin.php:753
+#: ../../mod/admin.php:789
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Plugin %s povolen."
 
-#: ../../mod/admin.php:763 ../../mod/admin.php:961
+#: ../../mod/admin.php:799 ../../mod/admin.php:997
 msgid "Disable"
 msgstr "Zakázat"
 
-#: ../../mod/admin.php:765 ../../mod/admin.php:963
+#: ../../mod/admin.php:801 ../../mod/admin.php:999
 msgid "Enable"
 msgstr "Povolit"
 
-#: ../../mod/admin.php:787 ../../mod/admin.php:992
+#: ../../mod/admin.php:823 ../../mod/admin.php:1028
 msgid "Toggle"
 msgstr "Přepnout"
 
-#: ../../mod/admin.php:795 ../../mod/admin.php:1002
+#: ../../mod/admin.php:831 ../../mod/admin.php:1038
 msgid "Author: "
 msgstr "Autor: "
 
-#: ../../mod/admin.php:796 ../../mod/admin.php:1003
+#: ../../mod/admin.php:832 ../../mod/admin.php:1039
 msgid "Maintainer: "
 msgstr "Správce: "
 
-#: ../../mod/admin.php:925
+#: ../../mod/admin.php:961
 msgid "No themes found."
 msgstr "Nenalezeny žádná témata."
 
-#: ../../mod/admin.php:984
+#: ../../mod/admin.php:1020
 msgid "Screenshot"
 msgstr "Snímek obrazovky"
 
-#: ../../mod/admin.php:1032
+#: ../../mod/admin.php:1068
 msgid "[Experimental]"
 msgstr "[Experimentální]"
 
-#: ../../mod/admin.php:1033
+#: ../../mod/admin.php:1069
 msgid "[Unsupported]"
 msgstr "[Nepodporováno]"
 
-#: ../../mod/admin.php:1060
+#: ../../mod/admin.php:1096
 msgid "Log settings updated."
 msgstr "Nastavení protokolu aktualizováno."
 
-#: ../../mod/admin.php:1116
+#: ../../mod/admin.php:1152
 msgid "Clear"
 msgstr "Vyčistit"
 
-#: ../../mod/admin.php:1122
+#: ../../mod/admin.php:1158
 msgid "Debugging"
 msgstr "Ladění"
 
-#: ../../mod/admin.php:1123
+#: ../../mod/admin.php:1159
 msgid "Log file"
 msgstr "Soubor s logem"
 
-#: ../../mod/admin.php:1123
+#: ../../mod/admin.php:1159
 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:1124
+#: ../../mod/admin.php:1160
 msgid "Log level"
 msgstr "Úroveň auditu"
 
-#: ../../mod/admin.php:1174
+#: ../../mod/admin.php:1210
 msgid "Close"
 msgstr "Zavřít"
 
-#: ../../mod/admin.php:1180
+#: ../../mod/admin.php:1216
 msgid "FTP Host"
 msgstr "Hostitel FTP"
 
-#: ../../mod/admin.php:1181
+#: ../../mod/admin.php:1217
 msgid "FTP Path"
 msgstr "Cesta FTP"
 
-#: ../../mod/admin.php:1182
+#: ../../mod/admin.php:1218
 msgid "FTP User"
 msgstr "FTP uživatel"
 
-#: ../../mod/admin.php:1183
+#: ../../mod/admin.php:1219
 msgid "FTP Password"
 msgstr "FTP heslo"
 
-#: ../../mod/profile.php:21 ../../boot.php:1126
+#: ../../mod/profile.php:21 ../../boot.php:1160
 msgid "Requested profile is not available."
 msgstr "Požadovaný profil není k dispozici."
 
-#: ../../mod/profile.php:155 ../../mod/display.php:87
+#: ../../mod/profile.php:156 ../../mod/display.php:87
 msgid "Access to this profile has been restricted."
 msgstr "Přístup na tento profil byl omezen."
 
-#: ../../mod/profile.php:180
+#: ../../mod/profile.php:181
 msgid "Tips for New Members"
 msgstr "Tipy pro nové členy"
 
@@ -4246,7 +4335,7 @@ msgstr "{0} označen %s' příspěvek s #%s"
 msgid "{0} mentioned you in a post"
 msgstr "{0} vás zmínil v příspěvku"
 
-#: ../../mod/nogroup.php:58
+#: ../../mod/nogroup.php:59
 msgid "Contacts who are not members of a group"
 msgstr "Kontakty, které nejsou členy skupiny"
 
@@ -4259,8 +4348,8 @@ msgid ""
 "Account not found and OpenID registration is not permitted on this site."
 msgstr "Nenalezen účet a OpenID registrace na tomto serveru není dovolena."
 
-#: ../../mod/openid.php:93 ../../include/auth.php:110
-#: ../../include/auth.php:173
+#: ../../mod/openid.php:93 ../../include/auth.php:112
+#: ../../include/auth.php:175
 msgid "Login failed."
 msgstr "Přihlášení se nezdařilo."
 
@@ -4281,7 +4370,7 @@ msgstr "Žádné společné kontakty."
 msgid "%1$s is following %2$s's %3$s"
 msgstr "%1$s následuje %3$s uživatele %2$s"
 
-#: ../../mod/share.php:28
+#: ../../mod/share.php:43
 msgid "link"
 msgstr "odkaz"
 
@@ -4297,8 +4386,8 @@ msgstr "Aplikace"
 msgid "No installed applications."
 msgstr "Žádné nainstalované aplikace."
 
-#: ../../mod/search.php:99 ../../include/text.php:685
-#: ../../include/text.php:686 ../../include/nav.php:91
+#: ../../mod/search.php:99 ../../include/text.php:739
+#: ../../include/text.php:740 ../../include/nav.php:91
 msgid "Search"
 msgstr "Vyhledávání"
 
@@ -4595,32 +4684,32 @@ msgstr "Věk: "
 msgid "Edit/Manage Profiles"
 msgstr "Upravit / Spravovat profily"
 
-#: ../../mod/profiles.php:700 ../../boot.php:1244
+#: ../../mod/profiles.php:700 ../../boot.php:1278
 msgid "Change profile photo"
 msgstr "Změnit profilovou fotografii"
 
-#: ../../mod/profiles.php:701 ../../boot.php:1245
+#: ../../mod/profiles.php:701 ../../boot.php:1279
 msgid "Create New Profile"
 msgstr "Vytvořit nový profil"
 
-#: ../../mod/profiles.php:712 ../../boot.php:1255
+#: ../../mod/profiles.php:712 ../../boot.php:1289
 msgid "Profile Image"
 msgstr "Profilový obrázek"
 
-#: ../../mod/profiles.php:714 ../../boot.php:1258
+#: ../../mod/profiles.php:714 ../../boot.php:1292
 msgid "visible to everybody"
 msgstr "viditelné pro všechny"
 
-#: ../../mod/profiles.php:715 ../../boot.php:1259
+#: ../../mod/profiles.php:715 ../../boot.php:1293
 msgid "Edit visibility"
 msgstr "Upravit viditelnost"
 
-#: ../../mod/filer.php:29 ../../include/conversation.php:909
-#: ../../include/conversation.php:927
+#: ../../mod/filer.php:30 ../../include/conversation.php:945
+#: ../../include/conversation.php:963
 msgid "Save to Folder:"
 msgstr "Uložit do složky:"
 
-#: ../../mod/filer.php:29
+#: ../../mod/filer.php:30
 msgid "- select -"
 msgstr "- vyber -"
 
@@ -4633,7 +4722,7 @@ msgstr "%1$s označen uživatelem %2$s %3$s s %4$s"
 msgid "No potential page delegates located."
 msgstr "Žádní potenciální delegáti stránky nenalezeni."
 
-#: ../../mod/delegate.php:121
+#: ../../mod/delegate.php:121 ../../include/nav.php:138
 msgid "Delegate Page Management"
 msgstr "Správa delegátů stránky"
 
@@ -4708,7 +4797,7 @@ msgstr "Vstupní data (ve formátu Diaspora): "
 msgid "diaspora2bb: "
 msgstr "diaspora2bb: "
 
-#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:520
+#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:521
 #: ../../include/contact_widgets.php:34
 msgid "Friend Suggestions"
 msgstr "Návrhy přátel"
@@ -4724,7 +4813,7 @@ msgid "Ignore/Hide"
 msgstr "Ignorovat / skrýt"
 
 #: ../../mod/directory.php:49 ../../addon/forumdirectory/forumdirectory.php:71
-#: ../../view/theme/diabook/theme.php:518
+#: ../../view/theme/diabook/theme.php:519
 msgid "Global Directory"
 msgstr "Globální adresář"
 
@@ -4743,19 +4832,19 @@ msgstr "Pohlaví: "
 
 #: ../../mod/directory.php:136
 #: ../../addon/forumdirectory/forumdirectory.php:158
-#: ../../include/profile_advanced.php:17 ../../boot.php:1280
+#: ../../include/profile_advanced.php:17 ../../boot.php:1314
 msgid "Gender:"
 msgstr "Pohlaví:"
 
 #: ../../mod/directory.php:138
 #: ../../addon/forumdirectory/forumdirectory.php:160
-#: ../../include/profile_advanced.php:37 ../../boot.php:1283
+#: ../../include/profile_advanced.php:37 ../../boot.php:1317
 msgid "Status:"
 msgstr "Status:"
 
 #: ../../mod/directory.php:140
 #: ../../addon/forumdirectory/forumdirectory.php:162
-#: ../../include/profile_advanced.php:48 ../../boot.php:1285
+#: ../../include/profile_advanced.php:48 ../../boot.php:1319
 msgid "Homepage:"
 msgstr "Domácí stránka:"
 
@@ -4765,8 +4854,8 @@ msgstr "Domácí stránka:"
 msgid "About:"
 msgstr "O mě:"
 
-#: ../../mod/directory.php:180
-#: ../../addon/forumdirectory/forumdirectory.php:202
+#: ../../mod/directory.php:187
+#: ../../addon/forumdirectory/forumdirectory.php:203
 msgid "No entries (some entries may be hidden)."
 msgstr "Žádné záznamy (některé položky mohou být skryty)."
 
@@ -5179,7 +5268,7 @@ msgstr "Nové hodnoty byly uloženy"
 msgid "Post to Facebook"
 msgstr "Přidat příspěvek na Facebook"
 
-#: ../../addon/facebook/facebook.php:921 ../../addon/fbpost/fbpost.php:446
+#: ../../addon/facebook/facebook.php:921 ../../addon/fbpost/fbpost.php:471
 #: ../../addon.old/facebook/facebook.php:921
 #: ../../addon.old/fbpost/fbpost.php:399
 msgid ""
@@ -5187,31 +5276,31 @@ msgid ""
 "conflict."
 msgstr "Příspěvek na Facebook zrušen kvůli konfliktu přístupových práv mezi sítěmi."
 
-#: ../../addon/facebook/facebook.php:1149 ../../addon/fbpost/fbpost.php:722
+#: ../../addon/facebook/facebook.php:1149 ../../addon/fbpost/fbpost.php:750
 #: ../../addon.old/facebook/facebook.php:1149
 #: ../../addon.old/fbpost/fbpost.php:610
 msgid "View on Friendica"
 msgstr "Zobrazení na Friendica"
 
-#: ../../addon/facebook/facebook.php:1182 ../../addon/fbpost/fbpost.php:759
+#: ../../addon/facebook/facebook.php:1182 ../../addon/fbpost/fbpost.php:787
 #: ../../addon.old/facebook/facebook.php:1182
 #: ../../addon.old/fbpost/fbpost.php:643
 msgid "Facebook post failed. Queued for retry."
 msgstr "Zaslání příspěvku na Facebook selhalo. Příspěvek byl zařazen do fronty pro opakované odeslání."
 
-#: ../../addon/facebook/facebook.php:1222 ../../addon/fbpost/fbpost.php:799
+#: ../../addon/facebook/facebook.php:1222 ../../addon/fbpost/fbpost.php:827
 #: ../../addon.old/facebook/facebook.php:1222
 #: ../../addon.old/fbpost/fbpost.php:683
 msgid "Your Facebook connection became invalid. Please Re-authenticate."
 msgstr "Vaše připojení na Facebook přestalo být platné. Prosím znovu se přihlaste."
 
-#: ../../addon/facebook/facebook.php:1223 ../../addon/fbpost/fbpost.php:800
+#: ../../addon/facebook/facebook.php:1223 ../../addon/fbpost/fbpost.php:828
 #: ../../addon.old/facebook/facebook.php:1223
 #: ../../addon.old/fbpost/fbpost.php:684
 msgid "Facebook connection became invalid"
 msgstr "Připojení na Facebook bylo zneplatněno."
 
-#: ../../addon/facebook/facebook.php:1224 ../../addon/fbpost/fbpost.php:801
+#: ../../addon/facebook/facebook.php:1224 ../../addon/fbpost/fbpost.php:829
 #: ../../addon.old/facebook/facebook.php:1224
 #: ../../addon.old/fbpost/fbpost.php:685
 #, php-format
@@ -5236,27 +5325,27 @@ msgstr "Nastavení StatusNet automatického následování (AutoFollow)"
 msgid "Automatically follow any StatusNet followers/mentioners"
 msgstr "Automaticky následovat jakékoliv StatusNet následníky/přispivatele"
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:278
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:343
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:260
 msgid "Lifetime of the cache (in hours)"
 msgstr "Životnost vyrovnávací paměti (v hodinách)"
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:283
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:348
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:265
 msgid "Cache Statistics"
 msgstr "Statistika vyrovnávací paměti"
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:286
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:351
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:268
 msgid "Number of items"
 msgstr "Počet položek"
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:288
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:353
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:270
 msgid "Size of the cache"
 msgstr "Velikost vyrovnávací paměti"
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:290
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:355
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:272
 msgid "Delete the whole cache"
 msgstr "Vymazat celou vyrovnávací paměť"
@@ -5289,7 +5378,12 @@ msgstr "Příspěvek na stránku/skupinu"
 msgid "Facebook Post Settings"
 msgstr "Nastavení konektoru pro příspěvky na Facebook"
 
-#: ../../addon/widgets/widget_like.php:58
+#: ../../addon/fbpost/fbpost.php:367
+#, php-format
+msgid "%s:"
+msgstr "%s:"
+
+#: ../../addon/widgets/widget_like.php:59
 #: ../../addon.old/widgets/widget_like.php:58
 #, php-format
 msgid "%d person likes this"
@@ -5298,7 +5392,7 @@ msgstr[0] "%d člověku se toto líbí"
 msgstr[1] "%d lidem se toto líbí"
 msgstr[2] "%d lidem se toto líbí"
 
-#: ../../addon/widgets/widget_like.php:61
+#: ../../addon/widgets/widget_like.php:62
 #: ../../addon.old/widgets/widget_like.php:61
 #, php-format
 msgid "%d person doesn't like this"
@@ -5312,15 +5406,15 @@ msgstr[2] "%d lidem se toto nelíbí"
 msgid "Get added to this list!"
 msgstr "Nechte se přidat do tohoto listu!"
 
-#: ../../addon/widgets/widgets.php:56 ../../addon.old/widgets/widgets.php:56
+#: ../../addon/widgets/widgets.php:57 ../../addon.old/widgets/widgets.php:56
 msgid "Generate new key"
 msgstr "Generovat nové klíče"
 
-#: ../../addon/widgets/widgets.php:59 ../../addon.old/widgets/widgets.php:59
+#: ../../addon/widgets/widgets.php:60 ../../addon.old/widgets/widgets.php:59
 msgid "Widgets key"
 msgstr "Widgety klíč"
 
-#: ../../addon/widgets/widgets.php:61 ../../addon.old/widgets/widgets.php:61
+#: ../../addon/widgets/widgets.php:62 ../../addon.old/widgets/widgets.php:61
 msgid "Widgets available"
 msgstr "Widgety k dispozici"
 
@@ -5643,7 +5737,7 @@ msgstr "Adresář Fór"
 #: ../../addon/communityhome/communityhome.php:34
 #: ../../addon/communityhome/twillingham/communityhome.php:28
 #: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:949
+#: ../../include/nav.php:64 ../../boot.php:976
 #: ../../addon.old/communityhome/communityhome.php:28
 #: ../../addon.old/communityhome/communityhome.php:34
 #: ../../addon.old/communityhome/twillingham/communityhome.php:28
@@ -5665,25 +5759,25 @@ msgstr "OpenID"
 msgid "Latest users"
 msgstr "Poslední uživatelé"
 
-#: ../../addon/communityhome/communityhome.php:81
+#: ../../addon/communityhome/communityhome.php:82
 #: ../../addon/communityhome/twillingham/communityhome.php:81
 #: ../../addon.old/communityhome/communityhome.php:81
 #: ../../addon.old/communityhome/twillingham/communityhome.php:81
 msgid "Most active users"
 msgstr "Nejaktivnější uživatelé"
 
-#: ../../addon/communityhome/communityhome.php:98
+#: ../../addon/communityhome/communityhome.php:99
 #: ../../addon.old/communityhome/communityhome.php:98
 msgid "Latest photos"
 msgstr "Poslední fotky"
 
-#: ../../addon/communityhome/communityhome.php:134
+#: ../../addon/communityhome/communityhome.php:136
 #: ../../addon.old/communityhome/communityhome.php:133
 msgid "Latest likes"
 msgstr "Poslední \"líbí se mi\""
 
-#: ../../addon/communityhome/communityhome.php:156
-#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1440
+#: ../../addon/communityhome/communityhome.php:158
+#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1497
 #: ../../include/conversation.php:117 ../../include/conversation.php:245
 #: ../../addon.old/communityhome/communityhome.php:155
 msgid "event"
@@ -5837,7 +5931,7 @@ msgstr "Dny"
 #: ../../addon/dav/common/wdcal_edit.inc.php:254
 #: ../../addon/dav/common/wdcal_edit.inc.php:270
 #: ../../addon/dav/common/wdcal_edit.inc.php:293
-#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:976
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:231
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:254
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:270
@@ -5848,7 +5942,7 @@ msgstr "Neděle"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:235
 #: ../../addon/dav/common/wdcal_edit.inc.php:274
-#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:976
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:235
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:274
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:308
@@ -5856,35 +5950,35 @@ msgid "Monday"
 msgstr "Pondělí"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:238
-#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:976
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:238
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:277
 msgid "Tuesday"
 msgstr "Úterý"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:241
-#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:976
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:241
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:280
 msgid "Wednesday"
 msgstr "Středa"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:244
-#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:976
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:244
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:283
 msgid "Thursday"
 msgstr "Čtvrtek"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:247
-#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:976
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:247
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:286
 msgid "Friday"
 msgstr "Pátek"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:250
-#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:976
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:250
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:289
 msgid "Saturday"
@@ -6251,8 +6345,8 @@ msgid "Extended calendar with CalDAV-support"
 msgstr "Rozšířený kalendář s podporou CalDAV"
 
 #: ../../addon/dav/friendica/main.php:279
-#: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:464
-#: ../../include/enotify.php:28 ../../include/notifier.php:778
+#: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:468
+#: ../../include/enotify.php:28 ../../include/notifier.php:781
 #: ../../addon.old/dav/friendica/main.php:279
 #: ../../addon.old/dav/friendica/main.php:280
 msgid "noreply"
@@ -6501,43 +6595,43 @@ msgstr "dreamwidth heslo"
 msgid "Post to dreamwidth by default"
 msgstr "Defaultně umístit na dreamwidth"
 
-#: ../../addon/remote_permissions/remote_permissions.php:44
+#: ../../addon/remote_permissions/remote_permissions.php:45
 msgid "Remote Permissions Settings"
 msgstr "Nastavení Vzdálených oprávnění"
 
-#: ../../addon/remote_permissions/remote_permissions.php:45
+#: ../../addon/remote_permissions/remote_permissions.php:46
 msgid ""
 "Allow recipients of your private posts to see the other recipients of the "
 "posts"
 msgstr "Umožnit příjemcům Vašich soukromých příspěvků vidět ostatní příjemce příspěvků"
 
-#: ../../addon/remote_permissions/remote_permissions.php:57
+#: ../../addon/remote_permissions/remote_permissions.php:58
 msgid "Remote Permissions settings updated."
 msgstr "Nastavení Vzdálených opravnění aktualizováno."
 
-#: ../../addon/remote_permissions/remote_permissions.php:177
+#: ../../addon/remote_permissions/remote_permissions.php:178
 msgid "Visible to"
 msgstr "Viditelné pro"
 
-#: ../../addon/remote_permissions/remote_permissions.php:177
+#: ../../addon/remote_permissions/remote_permissions.php:178
 msgid "may only be a partial list"
 msgstr "pouze pro část seznamu"
 
-#: ../../addon/remote_permissions/remote_permissions.php:196
+#: ../../addon/remote_permissions/remote_permissions.php:197
 #: ../../addon/altpager/altpager.php:99
 msgid "Global"
 msgstr "Globální"
 
-#: ../../addon/remote_permissions/remote_permissions.php:196
+#: ../../addon/remote_permissions/remote_permissions.php:197
 msgid "The posts of every user on this server show the post recipients"
 msgstr "Příspěvek každého uživatele na tomto serveru zobrazuje příjemce příspěvků"
 
-#: ../../addon/remote_permissions/remote_permissions.php:197
+#: ../../addon/remote_permissions/remote_permissions.php:198
 #: ../../addon/altpager/altpager.php:100
 msgid "Individual"
 msgstr "Individuálové"
 
-#: ../../addon/remote_permissions/remote_permissions.php:197
+#: ../../addon/remote_permissions/remote_permissions.php:198
 msgid "Each user chooses whether his/her posts show the post recipients"
 msgstr "Každý uživatel si zvolí, zda-li jeho/její příspěvek zobrazí příjemce příspěvku."
 
@@ -7014,11 +7108,11 @@ msgstr "Rozšíření MathJax vykresluje matematické vzorce zapsané s použit
 msgid "Use the MathJax renderer"
 msgstr "Použít Mathjax vykreslování"
 
-#: ../../addon/mathjax/mathjax.php:74 ../../addon.old/mathjax/mathjax.php:74
+#: ../../addon/mathjax/mathjax.php:75 ../../addon.old/mathjax/mathjax.php:74
 msgid "MathJax Base URL"
 msgstr "Základní MathJax adresa URL"
 
-#: ../../addon/mathjax/mathjax.php:74 ../../addon.old/mathjax/mathjax.php:74
+#: ../../addon/mathjax/mathjax.php:75 ../../addon.old/mathjax/mathjax.php:74
 msgid ""
 "The URL for the javascript file that should be included to use MathJax. Can "
 "be either the MathJax CDN or another installation of MathJax."
@@ -7334,7 +7428,7 @@ msgstr "Poslat propojené #-tagy a @-jména na StatusNet"
 msgid "Clear OAuth configuration"
 msgstr "Vymazat konfiguraci OAuth"
 
-#: ../../addon/statusnet/statusnet.php:692
+#: ../../addon/statusnet/statusnet.php:695
 #: ../../addon.old/statusnet/statusnet.php:568
 msgid "API URL"
 msgstr "API URL"
@@ -7580,11 +7674,11 @@ msgstr "Defaultně zasílat veřejné komentáře na Twitter"
 msgid "Send linked #-tags and @-names to Twitter"
 msgstr "Poslat propojené #-tagy a @-jména na Twitter"
 
-#: ../../addon/twitter/twitter.php:508 ../../addon.old/twitter/twitter.php:396
+#: ../../addon/twitter/twitter.php:517 ../../addon.old/twitter/twitter.php:396
 msgid "Consumer key"
 msgstr "Consumer key"
 
-#: ../../addon/twitter/twitter.php:509 ../../addon.old/twitter/twitter.php:397
+#: ../../addon/twitter/twitter.php:518 ../../addon.old/twitter/twitter.php:397
 msgid "Consumer secret"
 msgstr "Consumer secret"
 
@@ -7722,137 +7816,137 @@ msgstr "Nastavení šířku grafické šablony"
 msgid "Color scheme"
 msgstr "Barevné schéma"
 
-#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49
+#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:49
 #: ../../include/nav.php:116
 msgid "Your posts and conversations"
 msgstr "Vaše příspěvky a konverzace"
 
-#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:50
+#: ../../view/theme/diabook/theme.php:89 ../../include/nav.php:50
 msgid "Your profile page"
 msgstr "Vaše profilová stránka"
 
-#: ../../view/theme/diabook/theme.php:89
+#: ../../view/theme/diabook/theme.php:90
 msgid "Your contacts"
 msgstr "Vaše kontakty"
 
-#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51
+#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:51
 msgid "Your photos"
 msgstr "Vaše fotky"
 
-#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52
+#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:52
 msgid "Your events"
 msgstr "Vaše události"
 
-#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:93 ../../include/nav.php:53
 msgid "Personal notes"
 msgstr "Osobní poznámky"
 
-#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:93 ../../include/nav.php:53
 msgid "Your personal photos"
 msgstr "Vaše osobní fotky"
 
-#: ../../view/theme/diabook/theme.php:94
-#: ../../view/theme/diabook/theme.php:537
-#: ../../view/theme/diabook/theme.php:632
+#: ../../view/theme/diabook/theme.php:95
+#: ../../view/theme/diabook/theme.php:538
+#: ../../view/theme/diabook/theme.php:633
 #: ../../view/theme/diabook/config.php:163
 msgid "Community Pages"
 msgstr "Komunitní stránky"
 
-#: ../../view/theme/diabook/theme.php:384
-#: ../../view/theme/diabook/theme.php:634
+#: ../../view/theme/diabook/theme.php:385
+#: ../../view/theme/diabook/theme.php:635
 #: ../../view/theme/diabook/config.php:165
 msgid "Community Profiles"
 msgstr "Komunitní profily"
 
-#: ../../view/theme/diabook/theme.php:405
-#: ../../view/theme/diabook/theme.php:639
+#: ../../view/theme/diabook/theme.php:406
+#: ../../view/theme/diabook/theme.php:640
 #: ../../view/theme/diabook/config.php:170
 msgid "Last users"
 msgstr "Poslední uživatelé"
 
-#: ../../view/theme/diabook/theme.php:434
-#: ../../view/theme/diabook/theme.php:641
+#: ../../view/theme/diabook/theme.php:435
+#: ../../view/theme/diabook/theme.php:642
 #: ../../view/theme/diabook/config.php:172
 msgid "Last likes"
 msgstr "Poslední líbí/nelíbí"
 
-#: ../../view/theme/diabook/theme.php:479
-#: ../../view/theme/diabook/theme.php:640
+#: ../../view/theme/diabook/theme.php:480
+#: ../../view/theme/diabook/theme.php:641
 #: ../../view/theme/diabook/config.php:171
 msgid "Last photos"
 msgstr "Poslední fotografie"
 
-#: ../../view/theme/diabook/theme.php:516
-#: ../../view/theme/diabook/theme.php:637
+#: ../../view/theme/diabook/theme.php:517
+#: ../../view/theme/diabook/theme.php:638
 #: ../../view/theme/diabook/config.php:168
 msgid "Find Friends"
 msgstr "Nalézt Přátele"
 
-#: ../../view/theme/diabook/theme.php:517
+#: ../../view/theme/diabook/theme.php:518
 msgid "Local Directory"
 msgstr "Lokální Adresář"
 
-#: ../../view/theme/diabook/theme.php:519 ../../include/contact_widgets.php:35
+#: ../../view/theme/diabook/theme.php:520 ../../include/contact_widgets.php:35
 msgid "Similar Interests"
 msgstr "Podobné zájmy"
 
-#: ../../view/theme/diabook/theme.php:521 ../../include/contact_widgets.php:37
+#: ../../view/theme/diabook/theme.php:522 ../../include/contact_widgets.php:37
 msgid "Invite Friends"
 msgstr "Pozvat přátele"
 
-#: ../../view/theme/diabook/theme.php:572
-#: ../../view/theme/diabook/theme.php:633
+#: ../../view/theme/diabook/theme.php:573
+#: ../../view/theme/diabook/theme.php:634
 #: ../../view/theme/diabook/config.php:164
 msgid "Earth Layers"
 msgstr "Earth Layers"
 
-#: ../../view/theme/diabook/theme.php:577
+#: ../../view/theme/diabook/theme.php:578
 msgid "Set zoomfactor for Earth Layers"
 msgstr "Nastavit faktor přiblížení pro Earth Layers"
 
-#: ../../view/theme/diabook/theme.php:578
+#: ../../view/theme/diabook/theme.php:579
 #: ../../view/theme/diabook/config.php:161
 msgid "Set longitude (X) for Earth Layers"
 msgstr "Nastavit zeměpistnou délku (X) pro Earth Layers"
 
-#: ../../view/theme/diabook/theme.php:579
+#: ../../view/theme/diabook/theme.php:580
 #: ../../view/theme/diabook/config.php:162
 msgid "Set latitude (Y) for Earth Layers"
 msgstr "Nastavit zeměpistnou šířku (X) pro Earth Layers"
 
-#: ../../view/theme/diabook/theme.php:592
-#: ../../view/theme/diabook/theme.php:635
+#: ../../view/theme/diabook/theme.php:593
+#: ../../view/theme/diabook/theme.php:636
 #: ../../view/theme/diabook/config.php:166
 msgid "Help or @NewHere ?"
 msgstr "Pomoc nebo @ProNováčky ?"
 
-#: ../../view/theme/diabook/theme.php:599
-#: ../../view/theme/diabook/theme.php:636
+#: ../../view/theme/diabook/theme.php:600
+#: ../../view/theme/diabook/theme.php:637
 #: ../../view/theme/diabook/config.php:167
 msgid "Connect Services"
 msgstr "Propojené služby"
 
-#: ../../view/theme/diabook/theme.php:606
-#: ../../view/theme/diabook/theme.php:638
+#: ../../view/theme/diabook/theme.php:607
+#: ../../view/theme/diabook/theme.php:639
 msgid "Last Tweets"
 msgstr "Poslední tweety"
 
-#: ../../view/theme/diabook/theme.php:609
+#: ../../view/theme/diabook/theme.php:610
 #: ../../view/theme/diabook/config.php:159
 msgid "Set twitter search term"
 msgstr "Nastavit vyhledávací frázi na twitteru"
 
-#: ../../view/theme/diabook/theme.php:629
+#: ../../view/theme/diabook/theme.php:630
 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:313
 msgid "don't show"
 msgstr "nikdy nezobrazit"
 
-#: ../../view/theme/diabook/theme.php:629
+#: ../../view/theme/diabook/theme.php:630
 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:312
 msgid "show"
 msgstr "zobrazit"
 
-#: ../../view/theme/diabook/theme.php:630
+#: ../../view/theme/diabook/theme.php:631
 msgid "Show/hide boxes at right-hand column:"
 msgstr "Zobrazit/skrýt boxy na pravém sloupci:"
 
@@ -8263,11 +8357,11 @@ msgstr "Nezajímá"
 msgid "Ask me"
 msgstr "Zeptej se mě"
 
-#: ../../include/event.php:20 ../../include/bb2diaspora.php:396
+#: ../../include/event.php:20 ../../include/bb2diaspora.php:399
 msgid "Starts:"
 msgstr "Začíná:"
 
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:404
+#: ../../include/event.php:30 ../../include/bb2diaspora.php:407
 msgid "Finishes:"
 msgstr "Končí:"
 
@@ -8279,35 +8373,35 @@ msgstr "(Bez předmětu)"
 msgid " on Last.fm"
 msgstr " na Last.fm"
 
-#: ../../include/text.php:243
+#: ../../include/text.php:263
 msgid "prev"
 msgstr "předchozí"
 
-#: ../../include/text.php:245
+#: ../../include/text.php:265
 msgid "first"
 msgstr "první"
 
-#: ../../include/text.php:274
+#: ../../include/text.php:294
 msgid "last"
 msgstr "poslední"
 
-#: ../../include/text.php:277
+#: ../../include/text.php:297
 msgid "next"
 msgstr "další"
 
-#: ../../include/text.php:295
+#: ../../include/text.php:315
 msgid "newer"
 msgstr "novější"
 
-#: ../../include/text.php:299
+#: ../../include/text.php:319
 msgid "older"
 msgstr "starší"
 
-#: ../../include/text.php:604
+#: ../../include/text.php:658
 msgid "No contacts"
 msgstr "Žádné kontakty"
 
-#: ../../include/text.php:613
+#: ../../include/text.php:667
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
@@ -8315,207 +8409,207 @@ msgstr[0] "%d kontakt"
 msgstr[1] "%d kontaktů"
 msgstr[2] "%d kontaktů"
 
-#: ../../include/text.php:726
+#: ../../include/text.php:780
 msgid "poke"
 msgstr "šťouchnout"
 
-#: ../../include/text.php:726 ../../include/conversation.php:210
+#: ../../include/text.php:780 ../../include/conversation.php:210
 msgid "poked"
 msgstr "šťouchnut"
 
-#: ../../include/text.php:727
+#: ../../include/text.php:781
 msgid "ping"
 msgstr "cinknout"
 
-#: ../../include/text.php:727
+#: ../../include/text.php:781
 msgid "pinged"
 msgstr "cinkut"
 
-#: ../../include/text.php:728
+#: ../../include/text.php:782
 msgid "prod"
 msgstr "pobídnout"
 
-#: ../../include/text.php:728
+#: ../../include/text.php:782
 msgid "prodded"
 msgstr "pobídnut"
 
-#: ../../include/text.php:729
+#: ../../include/text.php:783
 msgid "slap"
 msgstr "dát facku"
 
-#: ../../include/text.php:729
+#: ../../include/text.php:783
 msgid "slapped"
 msgstr "být uhozen"
 
-#: ../../include/text.php:730
+#: ../../include/text.php:784
 msgid "finger"
 msgstr ""
 
-#: ../../include/text.php:730
+#: ../../include/text.php:784
 msgid "fingered"
 msgstr ""
 
-#: ../../include/text.php:731
+#: ../../include/text.php:785
 msgid "rebuff"
 msgstr "odmítnout"
 
-#: ../../include/text.php:731
+#: ../../include/text.php:785
 msgid "rebuffed"
 msgstr "odmítnut"
 
-#: ../../include/text.php:743
+#: ../../include/text.php:797
 msgid "happy"
 msgstr "šťasný"
 
-#: ../../include/text.php:744
+#: ../../include/text.php:798
 msgid "sad"
 msgstr "smutný"
 
-#: ../../include/text.php:745
+#: ../../include/text.php:799
 msgid "mellow"
 msgstr "jemný"
 
-#: ../../include/text.php:746
+#: ../../include/text.php:800
 msgid "tired"
 msgstr "unavený"
 
-#: ../../include/text.php:747
+#: ../../include/text.php:801
 msgid "perky"
 msgstr "emergický"
 
-#: ../../include/text.php:748
+#: ../../include/text.php:802
 msgid "angry"
 msgstr "nazlobený"
 
-#: ../../include/text.php:749
+#: ../../include/text.php:803
 msgid "stupified"
 msgstr "otupen"
 
-#: ../../include/text.php:750
+#: ../../include/text.php:804
 msgid "puzzled"
 msgstr "popletený"
 
-#: ../../include/text.php:751
+#: ../../include/text.php:805
 msgid "interested"
 msgstr "zajímavý"
 
-#: ../../include/text.php:752
+#: ../../include/text.php:806
 msgid "bitter"
 msgstr "hořký"
 
-#: ../../include/text.php:753
+#: ../../include/text.php:807
 msgid "cheerful"
 msgstr "radnostný"
 
-#: ../../include/text.php:754
+#: ../../include/text.php:808
 msgid "alive"
 msgstr "naživu"
 
-#: ../../include/text.php:755
+#: ../../include/text.php:809
 msgid "annoyed"
 msgstr "otráven"
 
-#: ../../include/text.php:756
+#: ../../include/text.php:810
 msgid "anxious"
 msgstr "znepokojený"
 
-#: ../../include/text.php:757
+#: ../../include/text.php:811
 msgid "cranky"
 msgstr "mrzutý"
 
-#: ../../include/text.php:758
+#: ../../include/text.php:812
 msgid "disturbed"
 msgstr "vyrušen"
 
-#: ../../include/text.php:759
+#: ../../include/text.php:813
 msgid "frustrated"
 msgstr "frustrovaný"
 
-#: ../../include/text.php:760
+#: ../../include/text.php:814
 msgid "motivated"
 msgstr "motivovaný"
 
-#: ../../include/text.php:761
+#: ../../include/text.php:815
 msgid "relaxed"
 msgstr "uvolněný"
 
-#: ../../include/text.php:762
+#: ../../include/text.php:816
 msgid "surprised"
 msgstr "překvapený"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "January"
 msgstr "Ledna"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "February"
 msgstr "Února"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "March"
 msgstr "Března"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "April"
 msgstr "Dubna"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "May"
 msgstr "Května"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "June"
 msgstr "Června"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "July"
 msgstr "Července"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "August"
 msgstr "Srpna"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "September"
 msgstr "Září"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "October"
 msgstr "Října"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "November"
 msgstr "Listopadu"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "December"
 msgstr "Prosinec"
 
-#: ../../include/text.php:1010
+#: ../../include/text.php:1067
 msgid "bytes"
 msgstr "bytů"
 
-#: ../../include/text.php:1037 ../../include/text.php:1049
+#: ../../include/text.php:1094 ../../include/text.php:1106
 msgid "Click to open/close"
 msgstr "Klikněte pro otevření/zavření"
 
-#: ../../include/text.php:1222 ../../include/user.php:236
+#: ../../include/text.php:1279 ../../include/user.php:236
 msgid "default"
 msgstr "standardní"
 
-#: ../../include/text.php:1234
+#: ../../include/text.php:1291
 msgid "Select an alternate language"
 msgstr "Vyběr alternativního jazyka"
 
-#: ../../include/text.php:1444
+#: ../../include/text.php:1501
 msgid "activity"
 msgstr "aktivita"
 
-#: ../../include/text.php:1447
+#: ../../include/text.php:1504
 msgid "post"
 msgstr "příspěvek"
 
-#: ../../include/text.php:1602
+#: ../../include/text.php:1659
 msgid "Item filed"
 msgstr "Položka vyplněna"
 
@@ -8523,11 +8617,11 @@ msgstr "Položka vyplněna"
 msgid "Sharing notification from Diaspora network"
 msgstr "Sdílení oznámení ze sítě Diaspora"
 
-#: ../../include/diaspora.php:2236
+#: ../../include/diaspora.php:2239
 msgid "Attachments:"
 msgstr "Přílohy:"
 
-#: ../../include/network.php:847
+#: ../../include/network.php:850
 msgid "view full size"
 msgstr "zobrazit v plné velikosti"
 
@@ -8611,7 +8705,7 @@ msgstr "Vytvořit novou skupinu"
 msgid "Contacts not in any group"
 msgstr "Kontakty, které nejsou v žádné skupině"
 
-#: ../../include/nav.php:46 ../../boot.php:948
+#: ../../include/nav.php:46 ../../boot.php:975
 msgid "Logout"
 msgstr "Odhlásit se"
 
@@ -8619,7 +8713,7 @@ msgstr "Odhlásit se"
 msgid "End this session"
 msgstr "Konec této relace"
 
-#: ../../include/nav.php:49 ../../boot.php:1724
+#: ../../include/nav.php:49 ../../boot.php:1767
 msgid "Status"
 msgstr "Stav"
 
@@ -8707,23 +8801,27 @@ msgstr "Spravovat"
 msgid "Manage other pages"
 msgstr "Spravovat jiné stránky"
 
-#: ../../include/nav.php:140 ../../boot.php:1238
+#: ../../include/nav.php:138
+msgid "Delegations"
+msgstr "Delegace"
+
+#: ../../include/nav.php:142 ../../boot.php:1272
 msgid "Profiles"
 msgstr "Profily"
 
-#: ../../include/nav.php:140
+#: ../../include/nav.php:142
 msgid "Manage/Edit Profiles"
 msgstr "Spravovat/Editovat Profily"
 
-#: ../../include/nav.php:142
+#: ../../include/nav.php:144
 msgid "Manage/edit friends and contacts"
 msgstr "Spravovat/upravit přátelé a kontakty"
 
-#: ../../include/nav.php:149
+#: ../../include/nav.php:151
 msgid "Site setup and configuration"
 msgstr "Nastavení webu a konfigurace"
 
-#: ../../include/nav.php:173
+#: ../../include/nav.php:175
 msgid "Nothing new here"
 msgstr "Zde není nic nového"
 
@@ -8787,17 +8885,17 @@ msgstr "Všechno"
 msgid "Categories"
 msgstr "Kategorie"
 
-#: ../../include/auth.php:36
+#: ../../include/auth.php:38
 msgid "Logged out."
 msgstr "Odhlášen."
 
-#: ../../include/auth.php:126
+#: ../../include/auth.php:128
 msgid ""
 "We encountered a problem while logging in with the OpenID you provided. "
 "Please check the correct spelling of the ID."
 msgstr "Zaznamenali jsme problém s Vaším přihlášením prostřednictvím Vámi zadaným OpenID. Prosím ověřte si, že jste ID zadali správně. "
 
-#: ../../include/auth.php:126
+#: ../../include/auth.php:128
 msgid "The error message was:"
 msgstr "Chybová zpráva byla:"
 
@@ -8858,29 +8956,32 @@ msgstr "sekund"
 msgid "%1$d %2$s ago"
 msgstr "před %1$d %2$s"
 
-#: ../../include/datetime.php:472 ../../include/items.php:1695
+#: ../../include/datetime.php:472 ../../include/items.php:1705
 #, php-format
 msgid "%s's birthday"
 msgstr "%s má narozeniny"
 
-#: ../../include/datetime.php:473 ../../include/items.php:1696
+#: ../../include/datetime.php:473 ../../include/items.php:1706
 #, php-format
 msgid "Happy Birthday %s"
 msgstr "Veselé narozeniny %s"
 
-#: ../../include/onepoll.php:421
-msgid "From: "
-msgstr "Od:"
-
-#: ../../include/bbcode.php:202 ../../include/bbcode.php:423
+#: ../../include/bbcode.php:210 ../../include/bbcode.php:491
 msgid "Image/photo"
 msgstr "Obrázek/fotografie"
 
-#: ../../include/bbcode.php:388 ../../include/bbcode.php:408
+#: ../../include/bbcode.php:262
+#, php-format
+msgid ""
+"<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a "
+"href=\"%s\" target=\"external-link\">post</a>:</span>"
+msgstr "<span><a href=\"%s\" target=\"external-link\">%s</a> napsal následující  <a href=\"%s\" target=\"external-link\">příspěvek</a>:</span>"
+
+#: ../../include/bbcode.php:456 ../../include/bbcode.php:476
 msgid "$1 wrote:"
 msgstr "$1 napsal:"
 
-#: ../../include/bbcode.php:427 ../../include/bbcode.php:428
+#: ../../include/bbcode.php:496 ../../include/bbcode.php:497
 msgid "Encrypted content"
 msgstr "Šifrovaný obsah"
 
@@ -9286,15 +9387,15 @@ msgstr "Nepodařilo se získat kontaktní informace."
 msgid "following"
 msgstr "následující"
 
-#: ../../include/items.php:3363
+#: ../../include/items.php:3373
 msgid "A new person is sharing with you at "
 msgstr "Nový člověk si s vámi sdílí na"
 
-#: ../../include/items.php:3363
+#: ../../include/items.php:3373
 msgid "You have a new follower at "
 msgstr "Máte nového následovníka na"
 
-#: ../../include/items.php:4047
+#: ../../include/items.php:4057
 msgid "Archives"
 msgstr "Archív"
 
@@ -9388,34 +9489,34 @@ msgstr "Formulářový bezpečnostní token nebyl správný. To pravděpodobně
 msgid "stopped following"
 msgstr "následování zastaveno"
 
-#: ../../include/Contact.php:225 ../../include/conversation.php:795
+#: ../../include/Contact.php:225 ../../include/conversation.php:816
 msgid "Poke"
 msgstr "Šťouchnout"
 
-#: ../../include/Contact.php:226 ../../include/conversation.php:789
+#: ../../include/Contact.php:226 ../../include/conversation.php:810
 msgid "View Status"
 msgstr "Zobrazit Status"
 
-#: ../../include/Contact.php:227 ../../include/conversation.php:790
+#: ../../include/Contact.php:227 ../../include/conversation.php:811
 msgid "View Profile"
 msgstr "Zobrazit Profil"
 
-#: ../../include/Contact.php:228 ../../include/conversation.php:791
+#: ../../include/Contact.php:228 ../../include/conversation.php:812
 msgid "View Photos"
 msgstr "Zobrazit Fotky"
 
 #: ../../include/Contact.php:229 ../../include/Contact.php:242
-#: ../../include/conversation.php:792
+#: ../../include/conversation.php:813
 msgid "Network Posts"
 msgstr "Zobrazit Příspěvky sítě"
 
 #: ../../include/Contact.php:230 ../../include/Contact.php:242
-#: ../../include/conversation.php:793
+#: ../../include/conversation.php:814
 msgid "Edit Contact"
 msgstr "Editovat Kontakty"
 
 #: ../../include/Contact.php:231 ../../include/Contact.php:242
-#: ../../include/conversation.php:794
+#: ../../include/conversation.php:815
 msgid "Send PM"
 msgstr "Poslat soukromou zprávu"
 
@@ -9433,90 +9534,92 @@ 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:599 ../../object/Item.php:226
+#: ../../include/conversation.php:620 ../../object/Item.php:243
 msgid "Categories:"
 msgstr "Kategorie:"
 
-#: ../../include/conversation.php:600 ../../object/Item.php:227
+#: ../../include/conversation.php:621 ../../object/Item.php:244
 msgid "Filed under:"
 msgstr "Vyplněn pod:"
 
-#: ../../include/conversation.php:685
+#: ../../include/conversation.php:706
 msgid "remove"
 msgstr "odstranit"
 
-#: ../../include/conversation.php:689
+#: ../../include/conversation.php:710
 msgid "Delete Selected Items"
 msgstr "Smazat vybrané položky"
 
-#: ../../include/conversation.php:788
+#: ../../include/conversation.php:809
 msgid "Follow Thread"
 msgstr "Následovat vlákno"
 
-#: ../../include/conversation.php:857
+#: ../../include/conversation.php:878
 #, php-format
 msgid "%s likes this."
 msgstr "%s se to líbí."
 
-#: ../../include/conversation.php:857
+#: ../../include/conversation.php:878
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s se to nelíbí."
 
-#: ../../include/conversation.php:861
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this."
-msgstr "<span  %1$s>%2$d lidem</span> se to líbí."
+#: ../../include/conversation.php:884
+msgid "like this"
+msgstr "libí se mu"
 
-#: ../../include/conversation.php:863
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this."
-msgstr "<span  %1$s>%2$d lidem</span> se to nelíbí."
+#: ../../include/conversation.php:888
+msgid "don't like this"
+msgstr "nelíbí se mu"
 
-#: ../../include/conversation.php:869
+#: ../../include/conversation.php:895
+msgid "people"
+msgstr "lidé"
+
+#: ../../include/conversation.php:905
 msgid "and"
 msgstr "a"
 
-#: ../../include/conversation.php:875
+#: ../../include/conversation.php:911
 #, php-format
 msgid ", and %d other people"
 msgstr ", a %d dalších lidí"
 
-#: ../../include/conversation.php:877
+#: ../../include/conversation.php:913
 #, php-format
 msgid "%s like this."
 msgstr "%s se to líbí."
 
-#: ../../include/conversation.php:877
+#: ../../include/conversation.php:913
 #, php-format
 msgid "%s don't like this."
 msgstr "%s se to nelíbí."
 
-#: ../../include/conversation.php:904 ../../include/conversation.php:922
+#: ../../include/conversation.php:940 ../../include/conversation.php:958
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Viditelné pro <strong>všechny</strong>"
 
-#: ../../include/conversation.php:906 ../../include/conversation.php:924
+#: ../../include/conversation.php:942 ../../include/conversation.php:960
 msgid "Please enter a video link/URL:"
 msgstr "Prosím zadejte URL adresu videa:"
 
-#: ../../include/conversation.php:907 ../../include/conversation.php:925
+#: ../../include/conversation.php:943 ../../include/conversation.php:961
 msgid "Please enter an audio link/URL:"
 msgstr "Prosím zadejte URL adresu zvukového záznamu:"
 
-#: ../../include/conversation.php:908 ../../include/conversation.php:926
+#: ../../include/conversation.php:944 ../../include/conversation.php:962
 msgid "Tag term:"
 msgstr "Štítek:"
 
-#: ../../include/conversation.php:910 ../../include/conversation.php:928
+#: ../../include/conversation.php:946 ../../include/conversation.php:964
 msgid "Where are you right now?"
 msgstr "Kde právě jste?"
 
-#: ../../include/conversation.php:911
+#: ../../include/conversation.php:947
 msgid "Delete item(s)?"
 msgstr "Smazat položku(y)?"
 
-#: ../../include/conversation.php:990
+#: ../../include/conversation.php:1026
 msgid "permissions"
 msgstr "oprávnění"
 
@@ -9532,113 +9635,129 @@ msgstr "Tato akce překročí limit nastavené Vaším předplatným."
 msgid "This action is not available under your subscription plan."
 msgstr "Tato akce není v rámci Vašeho předplatného dostupná."
 
-#: ../../boot.php:607
+#: ../../boot.php:634
 msgid "Delete this item?"
 msgstr "Odstranit tuto položku?"
 
-#: ../../boot.php:610
+#: ../../boot.php:637
 msgid "show fewer"
 msgstr "zobrazit méně"
 
-#: ../../boot.php:819
+#: ../../boot.php:847
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Aktualizace %s selhala. Zkontrolujte protokol chyb."
 
-#: ../../boot.php:821
+#: ../../boot.php:849
 #, php-format
 msgid "Update Error at %s"
 msgstr "Chyba aktualizace na %s"
 
-#: ../../boot.php:922
+#: ../../boot.php:950
 msgid "Create a New Account"
 msgstr "Vytvořit nový účet"
 
-#: ../../boot.php:951
+#: ../../boot.php:978
 msgid "Nickname or Email address: "
 msgstr "Přezdívka nebo e-mailová adresa:"
 
-#: ../../boot.php:952
+#: ../../boot.php:979
 msgid "Password: "
 msgstr "Heslo: "
 
-#: ../../boot.php:953
+#: ../../boot.php:980
 msgid "Remember me"
 msgstr "Pamatuj si mne"
 
-#: ../../boot.php:956
+#: ../../boot.php:983
 msgid "Or login using OpenID: "
 msgstr "Nebo přihlášení pomocí OpenID: "
 
-#: ../../boot.php:962
+#: ../../boot.php:989
 msgid "Forgot your password?"
 msgstr "Zapomněli jste své heslo?"
 
-#: ../../boot.php:1087
+#: ../../boot.php:992
+msgid "Website Terms of Service"
+msgstr "Podmínky použití serveru"
+
+#: ../../boot.php:993
+msgid "terms of service"
+msgstr "podmínky použití"
+
+#: ../../boot.php:995
+msgid "Website Privacy Policy"
+msgstr "Pravidla ochrany soukromí serveru"
+
+#: ../../boot.php:996
+msgid "privacy policy"
+msgstr "Ochrana soukromí"
+
+#: ../../boot.php:1121
 msgid "Requested account is not available."
 msgstr "Požadovaný účet není dostupný."
 
-#: ../../boot.php:1164
+#: ../../boot.php:1198
 msgid "Edit profile"
 msgstr "Upravit profil"
 
-#: ../../boot.php:1230
+#: ../../boot.php:1264
 msgid "Message"
 msgstr "Zpráva"
 
-#: ../../boot.php:1238
+#: ../../boot.php:1272
 msgid "Manage/edit profiles"
 msgstr "Spravovat/upravit profily"
 
-#: ../../boot.php:1352 ../../boot.php:1438
+#: ../../boot.php:1395 ../../boot.php:1481
 msgid "g A l F d"
 msgstr "g A l F d"
 
-#: ../../boot.php:1353 ../../boot.php:1439
+#: ../../boot.php:1396 ../../boot.php:1482
 msgid "F d"
 msgstr "d. F"
 
-#: ../../boot.php:1398 ../../boot.php:1479
+#: ../../boot.php:1441 ../../boot.php:1522
 msgid "[today]"
 msgstr "[Dnes]"
 
-#: ../../boot.php:1410
+#: ../../boot.php:1453
 msgid "Birthday Reminders"
 msgstr "Připomínka narozenin"
 
-#: ../../boot.php:1411
+#: ../../boot.php:1454
 msgid "Birthdays this week:"
 msgstr "Narozeniny tento týden:"
 
-#: ../../boot.php:1472
+#: ../../boot.php:1515
 msgid "[No description]"
 msgstr "[Žádný popis]"
 
-#: ../../boot.php:1490
+#: ../../boot.php:1533
 msgid "Event Reminders"
 msgstr "Připomenutí událostí"
 
-#: ../../boot.php:1491
+#: ../../boot.php:1534
 msgid "Events this week:"
 msgstr "Události tohoto týdne:"
 
-#: ../../boot.php:1727
+#: ../../boot.php:1770
 msgid "Status Messages and Posts"
 msgstr "Statusové zprávy a příspěvky "
 
-#: ../../boot.php:1734
+#: ../../boot.php:1777
 msgid "Profile Details"
 msgstr "Detaily profilu"
 
-#: ../../boot.php:1751
+#: ../../boot.php:1794
 msgid "Events and Calendar"
 msgstr "Události a kalendář"
 
-#: ../../boot.php:1758
+#: ../../boot.php:1801
 msgid "Only You Can See This"
 msgstr "Toto můžete vidět jen Vy"
 
-#: ../../object/Item.php:238
+#: ../../object/Item.php:255
 msgid "via"
 msgstr "přes"
 
diff --git a/view/cs/smarty3/cmnt_received_eml.tpl b/view/cs/smarty3/cmnt_received_eml.tpl
index baa7c180a3..2bf7cc18c9 100644
--- a/view/cs/smarty3/cmnt_received_eml.tpl
+++ b/view/cs/smarty3/cmnt_received_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Milý/Milá {{$username}},
 
         '{{$from}}' okommentoval položku/konverzaci, kterou následujete.
diff --git a/view/cs/smarty3/cmnt_received_html_body_eml.tpl b/view/cs/smarty3/cmnt_received_html_body_eml.tpl
index 867e63332d..0fa62da8f5 100644
--- a/view/cs/smarty3/cmnt_received_html_body_eml.tpl
+++ b/view/cs/smarty3/cmnt_received_html_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
diff --git a/view/cs/smarty3/cmnt_received_text_body_eml.tpl b/view/cs/smarty3/cmnt_received_text_body_eml.tpl
index baa7c180a3..2bf7cc18c9 100644
--- a/view/cs/smarty3/cmnt_received_text_body_eml.tpl
+++ b/view/cs/smarty3/cmnt_received_text_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Milý/Milá {{$username}},
 
         '{{$from}}' okommentoval položku/konverzaci, kterou následujete.
diff --git a/view/cs/smarty3/follow_notify_eml.tpl b/view/cs/smarty3/follow_notify_eml.tpl
index 1430e83118..f2bd3175b3 100644
--- a/view/cs/smarty3/follow_notify_eml.tpl
+++ b/view/cs/smarty3/follow_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Milý/Milá {{$username}},
 
diff --git a/view/cs/smarty3/friend_complete_eml.tpl b/view/cs/smarty3/friend_complete_eml.tpl
index fc953b76cd..138036d637 100644
--- a/view/cs/smarty3/friend_complete_eml.tpl
+++ b/view/cs/smarty3/friend_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Milý/Milá {{$username}},
 
diff --git a/view/cs/smarty3/htconfig.tpl b/view/cs/smarty3/htconfig.tpl
index c9baae798f..da9b798c52 100644
--- a/view/cs/smarty3/htconfig.tpl
+++ b/view/cs/smarty3/htconfig.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?php
 
 // Nastavte následující pro Vaši instalaci MySQL
diff --git a/view/cs/smarty3/intro_complete_eml.tpl b/view/cs/smarty3/intro_complete_eml.tpl
index e770362faf..2666d46797 100644
--- a/view/cs/smarty3/intro_complete_eml.tpl
+++ b/view/cs/smarty3/intro_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Milý/Milá {{$username}},
 
diff --git a/view/cs/smarty3/lostpass_eml.tpl b/view/cs/smarty3/lostpass_eml.tpl
index 28f8517505..697908076a 100644
--- a/view/cs/smarty3/lostpass_eml.tpl
+++ b/view/cs/smarty3/lostpass_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Milý/Milá {{$username}},
 	Na webu {{$sitename}} byl zaregistrován požadavek na znovunastavení hesla k Vašemu účtu. Pro potvrzení této žádosti prosím klikněte na potvrzovací odkaz níže, nebo si tento odkaz zkopírujte do adresního řádku prohlížeče.  
diff --git a/view/cs/smarty3/mail_received_html_body_eml.tpl b/view/cs/smarty3/mail_received_html_body_eml.tpl
index b52abc3b1f..4da6c3cc90 100644
--- a/view/cs/smarty3/mail_received_html_body_eml.tpl
+++ b/view/cs/smarty3/mail_received_html_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
diff --git a/view/cs/smarty3/mail_received_text_body_eml.tpl b/view/cs/smarty3/mail_received_text_body_eml.tpl
index 0b4c585cf9..de9a84a764 100644
--- a/view/cs/smarty3/mail_received_text_body_eml.tpl
+++ b/view/cs/smarty3/mail_received_text_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$from}} Vám poslal(a) novou soukromou zprávu na {{$siteName}}.
 
 {{$title}}
diff --git a/view/cs/smarty3/passchanged_eml.tpl b/view/cs/smarty3/passchanged_eml.tpl
index 75db8ebbff..41eb2b403d 100644
--- a/view/cs/smarty3/passchanged_eml.tpl
+++ b/view/cs/smarty3/passchanged_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Milý/Milá {{$username}},
         Vaše heslo bylo na Vaši žádost změněno. Prosím zaznamenejte si tuto informaci (nebo si Vaše heslo změňte na nějaké, které si budete pamatovat).
diff --git a/view/cs/smarty3/register_open_eml.tpl b/view/cs/smarty3/register_open_eml.tpl
index fa1f828c13..7278baf7ce 100644
--- a/view/cs/smarty3/register_open_eml.tpl
+++ b/view/cs/smarty3/register_open_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Milý/milá {{$username}},
 	Díky za registraci na {{$sitename}}. Váš účet byl vytvořen.
 Vaše přihlašovací údaje jsou tato:
diff --git a/view/cs/smarty3/register_verify_eml.tpl b/view/cs/smarty3/register_verify_eml.tpl
index 9186e7332a..785a18267f 100644
--- a/view/cs/smarty3/register_verify_eml.tpl
+++ b/view/cs/smarty3/register_verify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Na webu {{$sitename}} byla vytvořena nová uživatelská registrace, která vyžaduje Vaše schválení.
 
diff --git a/view/cs/smarty3/request_notify_eml.tpl b/view/cs/smarty3/request_notify_eml.tpl
index f120891e80..537cea01c8 100644
--- a/view/cs/smarty3/request_notify_eml.tpl
+++ b/view/cs/smarty3/request_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Milý/Milá {{$username}},
 
diff --git a/view/cs/smarty3/wall_received_eml.tpl b/view/cs/smarty3/wall_received_eml.tpl
index 2578a4e7c6..a7c8bd1367 100644
--- a/view/cs/smarty3/wall_received_eml.tpl
+++ b/view/cs/smarty3/wall_received_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Milý/Milá {{$username}},
 
         '{{$from}}' obohatil Vaši profilovou zeď.
diff --git a/view/cs/smarty3/wall_received_html_body_eml.tpl b/view/cs/smarty3/wall_received_html_body_eml.tpl
index ebbc2a9e1e..245843e96c 100644
--- a/view/cs/smarty3/wall_received_html_body_eml.tpl
+++ b/view/cs/smarty3/wall_received_html_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
diff --git a/view/cs/smarty3/wall_received_text_body_eml.tpl b/view/cs/smarty3/wall_received_text_body_eml.tpl
index c8ac0216c3..eddf6d3307 100644
--- a/view/cs/smarty3/wall_received_text_body_eml.tpl
+++ b/view/cs/smarty3/wall_received_text_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Milý/Milá {{$username}},
 
         '{{$from}}' obohatil Vaši profilovou zeď.
diff --git a/view/cs/strings.php b/view/cs/strings.php
index 65b365115e..89d81837f0 100644
--- a/view/cs/strings.php
+++ b/view/cs/strings.php
@@ -258,6 +258,11 @@ $a->strings["This is most often a permission setting, as the web server may not
 $a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder."] = "Na konci této procedury obd nás obdržíte text k uložení v souboru pojmenovaném .htconfig.php ve Vašem Friendica kořenovém adresáři.";
 $a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Alternativně můžete tento krok přeskočit a provést manuální instalaci. Přečtěte si prosím soubor \"INSTALL.txt\" pro další instrukce.";
 $a->strings[".htconfig.php is writable"] = ".htconfig.php je editovatelné";
+$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica používá šablonovací nástroj Smarty3 pro zobrazení svých weobvých stránek. Smarty3 kompiluje šablony do PHP pro zrychlení vykreslování.";
+$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "Pro uložení kompilovaných šablon, webový server potřebuje mít přístup k zápisu do adresáře view/smarty3/ pod hlavním adresářem instalace Friendica";
+$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "prosím ujistěte se, že uživatel web serveru (jako například www-data) má právo zápisu do tohoto adresáře";
+$a->strings["Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains."] = "Poznámka: jako bezpečnostní opatření, přidělte právo zápisu pouze k adresáři /view/smarty3/ a nikoliv už k souborům s šablonami (.tpl), které obsahuje.";
+$a->strings["view/smarty3 is writable"] = "view/smarty3 je nastaven pro zápis";
 $a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "Url rewrite v .htconfig nefunguje. Prověřte prosím Vaše nastavení serveru.";
 $a->strings["Url rewrite is working"] = "Url rewrite je funkční.";
 $a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Databázový konfigurační soubor \".htconfig.php\" nemohl být uložen. Prosím, použijte přiložený text k vytvoření konfiguračního souboru ve vašem kořenovém adresáři webového serveru.";
@@ -615,7 +620,9 @@ $a->strings["Save"] = "Uložit";
 $a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Došlo k překročení maximálního povoleného počtu registrací za den na tomto serveru. Zkuste to  zítra znovu.";
 $a->strings["Import"] = "Import";
 $a->strings["Move account"] = "Přesunout účet";
-$a->strings["You can import an account from another Friendica server. <br>\r\n                            You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here.<br>\r\n                            <b>This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from diaspora"] = "Je možné  importovat účet z jiného Friendica serveru. <br>\nPotřebujete exportovat Váš účet ze starého serveru a importovat ho zde. My následně znovu vytvoříme Váš účet zde se všemi Vašimi kontakty. Také se pokusíme informovat všechny Vaše přátele o tom, že jste se sem přesunuli.<br>\n<b>Tato funkčnost je experimentální. Nemůžeme importovat kontakty ze sítě OStatus (statusnet/identi.ca) nebo z diaspory.";
+$a->strings["You can import an account from another Friendica server."] = "Můžete importovat účet z jiného Friendica serveru.";
+$a->strings["You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."] = "Musíte exportovat svůj účet na sterém serveru a nahrát ho zde. My následně vytvoříme Váš původní účet zde včetně všech kontaktů. Zároveň se pokusíme informovat všechny Vaše přátele, že jste se sem přestěhovali.";
+$a->strings["This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from Diaspora"] = "Tato funkčnost je experimentální. Nemůžeme importovat kontakty z OSStatus sítí (statusnet/identi.ca) nebo z Diaspory";
 $a->strings["Account file"] = "Soubor s účtem";
 $a->strings["To export your accont, go to \"Settings->Export your porsonal data\" and select \"Export account\""] = "K exportu Vašeho účtu, jděte do \"Nastavení->Export vašich osobních dat\" a zvolte \" Export účtu\"";
 $a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Došlo k překročení maximálního počtu zpráv na zeď během jednoho dne. Zpráva %s nedoručena.";
@@ -800,6 +807,7 @@ $a->strings["Self-signed certificate, use SSL for local links only (discouraged)
 $a->strings["File upload"] = "Nahrání souborů";
 $a->strings["Policies"] = "Politiky";
 $a->strings["Advanced"] = "Pokročilé";
+$a->strings["Performance"] = "Výkonnost";
 $a->strings["Site name"] = "Název webu";
 $a->strings["Banner/Logo"] = "Banner/logo";
 $a->strings["System language"] = "Systémový jazyk";
@@ -809,6 +817,8 @@ $a->strings["Mobile system theme"] = "Systémové téma zobrazení pro mobilní
 $a->strings["Theme for mobile devices"] = "Téma zobrazení pro mobilní zařízení";
 $a->strings["SSL link policy"] = "Politika SSL odkazů";
 $a->strings["Determines whether generated links should be forced to use SSL"] = "Určuje, zda-li budou generované odkazy používat SSL";
+$a->strings["'Share' element"] = "Element \"Sdílet\"";
+$a->strings["Activates the bbcode element 'share' for repeating items."] = "Aktivuje bbcode prvek 'share' pro opakované položky.";
 $a->strings["Maximum image size"] = "Maximální velikost obrázků";
 $a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maximální velikost v bajtech nahraných obrázků. Defaultní je 0, což znamená neomezeno.";
 $a->strings["Maximum image length"] = "Maximální velikost obrázků";
@@ -864,6 +874,14 @@ $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["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["Path to item cache"] = "Cesta k položkám vyrovnávací paměti";
+$a->strings["Cache duration in seconds"] = "Doba platnosti vyrovnávací paměti v sekundách";
+$a->strings["How long should the cache files be hold? Default value is 86400 seconds (One day)."] = "Jak dlouho by měla vyrovnávací paměť držet data? Výchozí hodnota je 86400 sekund (Jeden den).";
+$a->strings["Path for lock file"] = "Cesta k souboru zámku";
+$a->strings["Temp path"] = "Cesta k dočasným souborům";
+$a->strings["Base path to installation"] = "Základní cesta k instalaci";
 $a->strings["Update has been marked successful"] = "Aktualizace byla označena jako úspěšná.";
 $a->strings["Executing %s failed. Check system logs."] = "Vykonávání %s selhalo. Zkontrolujte chybový protokol.";
 $a->strings["Update %s was successfully applied."] = "Aktualizace %s byla úspěšně aplikována.";
@@ -1157,6 +1175,7 @@ $a->strings["Remove Facebook Post connector"] = "Odstranit konektor pro přísp
 $a->strings["Suppress \"View on friendica\""] = "Potlačit \"Zobrazit na friendica\"";
 $a->strings["Post to page/group:"] = "Příspěvek na stránku/skupinu";
 $a->strings["Facebook Post Settings"] = "Nastavení konektoru pro příspěvky na Facebook";
+$a->strings["%s:"] = "%s:";
 $a->strings["%d person likes this"] = array(
 	0 => "%d člověku se toto líbí",
 	1 => "%d lidem se toto líbí",
@@ -1876,6 +1895,7 @@ $a->strings["Inbox"] = "Doručená pošta";
 $a->strings["Outbox"] = "Odeslaná pošta";
 $a->strings["Manage"] = "Spravovat";
 $a->strings["Manage other pages"] = "Spravovat jiné stránky";
+$a->strings["Delegations"] = "Delegace";
 $a->strings["Profiles"] = "Profily";
 $a->strings["Manage/Edit Profiles"] = "Spravovat/Editovat Profily";
 $a->strings["Manage/edit friends and contacts"] = "Spravovat/upravit přátelé a kontakty";
@@ -1918,8 +1938,8 @@ $a->strings["seconds"] = "sekund";
 $a->strings["%1\$d %2\$s ago"] = "před %1\$d %2\$s";
 $a->strings["%s's birthday"] = "%s má narozeniny";
 $a->strings["Happy Birthday %s"] = "Veselé narozeniny %s";
-$a->strings["From: "] = "Od:";
 $a->strings["Image/photo"] = "Obrázek/fotografie";
+$a->strings["<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a href=\"%s\" target=\"external-link\">post</a>:</span>"] = "<span><a href=\"%s\" target=\"external-link\">%s</a> napsal následující  <a href=\"%s\" target=\"external-link\">příspěvek</a>:</span>";
 $a->strings["$1 wrote:"] = "$1 napsal:";
 $a->strings["Encrypted content"] = "Šifrovaný obsah";
 $a->strings["General Features"] = "Obecné funkčnosti";
@@ -2053,8 +2073,9 @@ $a->strings["Delete Selected Items"] = "Smazat vybrané položky";
 $a->strings["Follow Thread"] = "Následovat vlákno";
 $a->strings["%s likes this."] = "%s se to líbí.";
 $a->strings["%s doesn't like this."] = "%s se to nelíbí.";
-$a->strings["<span  %1\$s>%2\$d people</span> like this."] = "<span  %1\$s>%2\$d lidem</span> se to líbí.";
-$a->strings["<span  %1\$s>%2\$d people</span> don't like this."] = "<span  %1\$s>%2\$d lidem</span> se to nelíbí.";
+$a->strings["like this"] = "libí se mu";
+$a->strings["don't like this"] = "nelíbí se mu";
+$a->strings["people"] = "lidé";
 $a->strings["and"] = "a";
 $a->strings[", and %d other people"] = ", a %d dalších lidí";
 $a->strings["%s like this."] = "%s se to líbí.";
@@ -2079,6 +2100,10 @@ $a->strings["Password: "] = "Heslo: ";
 $a->strings["Remember me"] = "Pamatuj si mne";
 $a->strings["Or login using OpenID: "] = "Nebo přihlášení pomocí OpenID: ";
 $a->strings["Forgot your password?"] = "Zapomněli jste své heslo?";
+$a->strings["Website Terms of Service"] = "Podmínky použití serveru";
+$a->strings["terms of service"] = "podmínky použití";
+$a->strings["Website Privacy Policy"] = "Pravidla ochrany soukromí serveru";
+$a->strings["privacy policy"] = "Ochrana soukromí";
 $a->strings["Requested account is not available."] = "Požadovaný účet není dostupný.";
 $a->strings["Edit profile"] = "Upravit profil";
 $a->strings["Message"] = "Zpráva";
diff --git a/view/de/messages.po b/view/de/messages.po
index 95224e5387..d581275399 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -15,15 +15,16 @@
 # Martin Schmitt <mas@scsy.de>, 2012.
 #   <matthias@matthiasmoritz.de>, 2012.
 # Oliver  <post@toktan.org>, 2012.
-#   <tobias.diekershoff@gmx.net>, 2011-2012.
+#   <sebastian@sebsen.net>, 2012.
+#   <tobias.diekershoff@gmx.net>, 2011-2013.
 #   <transifex@zottel.net>, 2011-2012.
 #   <ts+transifex@ml.tschlotfeldt.de>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2012-12-22 10:00-0800\n"
-"PO-Revision-Date: 2012-12-24 08:27+0000\n"
+"POT-Creation-Date: 2013-01-08 10:00-0800\n"
+"PO-Revision-Date: 2013-01-10 05:19+0000\n"
 "Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -53,7 +54,7 @@ msgstr "Konnte den Kontakt nicht aktualisieren."
 #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:55
 #: ../../mod/fsuggest.php:78 ../../mod/events.php:140 ../../mod/api.php:26
 #: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:995
-#: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:135
+#: ../../mod/editpost.php:10 ../../mod/install.php:155 ../../mod/poke.php:135
 #: ../../mod/notifications.php:66 ../../mod/contacts.php:147
 #: ../../mod/settings.php:91 ../../mod/settings.php:542
 #: ../../mod/settings.php:547 ../../mod/manage.php:90 ../../mod/network.php:6
@@ -61,21 +62,21 @@ msgstr "Konnte den Kontakt nicht aktualisieren."
 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
 #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22
-#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:139
+#: ../../mod/register.php:40 ../../mod/regmod.php:125 ../../mod/item.php:139
 #: ../../mod/item.php:155 ../../mod/mood.php:114
 #: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169
 #: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193
 #: ../../mod/message.php:38 ../../mod/message.php:172
 #: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25
 #: ../../mod/wall_upload.php:66 ../../mod/follow.php:9
-#: ../../mod/display.php:165 ../../mod/profiles.php:7
-#: ../../mod/profiles.php:431 ../../mod/delegate.php:6
-#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
-#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510
-#: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:166
-#: ../../addon/fbpost/fbpost.php:172
+#: ../../mod/display.php:173 ../../mod/profiles.php:9
+#: ../../mod/profiles.php:148 ../../mod/delegate.php:6
+#: ../../mod/suggest.php:28 ../../mod/invite.php:15 ../../mod/invite.php:83
+#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:512
+#: ../../addon/facebook/facebook.php:518 ../../addon/fbpost/fbpost.php:170
+#: ../../addon/fbpost/fbpost.php:176
 #: ../../addon/dav/friendica/layout.fnk.php:354
-#: ../../addon/tumblr/tumblr.php:34 ../../include/items.php:3977
+#: ../../addon/tumblr/tumblr.php:34 ../../include/items.php:3994
 #: ../../index.php:333 ../../addon.old/facebook/facebook.php:510
 #: ../../addon.old/facebook/facebook.php:516
 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165
@@ -109,7 +110,7 @@ msgid "Return to contact editor"
 msgstr "Zurück zum Kontakteditor"
 
 #: ../../mod/crepair.php:148 ../../mod/settings.php:562
-#: ../../mod/settings.php:588 ../../mod/admin.php:695 ../../mod/admin.php:705
+#: ../../mod/settings.php:588 ../../mod/admin.php:731 ../../mod/admin.php:741
 msgid "Name"
 msgstr "Name"
 
@@ -146,28 +147,28 @@ msgid "New photo from this URL"
 msgstr "Neues Foto von dieser URL"
 
 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
-#: ../../mod/events.php:455 ../../mod/photos.php:1028
-#: ../../mod/photos.php:1100 ../../mod/photos.php:1363
-#: ../../mod/photos.php:1403 ../../mod/photos.php:1447
-#: ../../mod/photos.php:1519 ../../mod/install.php:246
-#: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199
-#: ../../mod/content.php:693 ../../mod/contacts.php:352
+#: ../../mod/events.php:466 ../../mod/photos.php:1028
+#: ../../mod/photos.php:1118 ../../mod/photos.php:1402
+#: ../../mod/photos.php:1442 ../../mod/photos.php:1486
+#: ../../mod/photos.php:1569 ../../mod/install.php:252
+#: ../../mod/install.php:290 ../../mod/localtime.php:45 ../../mod/poke.php:199
+#: ../../mod/content.php:710 ../../mod/contacts.php:352
 #: ../../mod/settings.php:560 ../../mod/settings.php:670
 #: ../../mod/settings.php:739 ../../mod/settings.php:811
-#: ../../mod/settings.php:1018 ../../mod/group.php:85 ../../mod/mood.php:137
-#: ../../mod/message.php:301 ../../mod/message.php:487 ../../mod/admin.php:445
-#: ../../mod/admin.php:692 ../../mod/admin.php:829 ../../mod/admin.php:1028
-#: ../../mod/admin.php:1115 ../../mod/profiles.php:604
-#: ../../mod/invite.php:119 ../../addon/fromgplus/fromgplus.php:44
-#: ../../addon/facebook/facebook.php:619
+#: ../../mod/settings.php:1018 ../../mod/group.php:87 ../../mod/mood.php:137
+#: ../../mod/message.php:301 ../../mod/message.php:527 ../../mod/admin.php:461
+#: ../../mod/admin.php:728 ../../mod/admin.php:865 ../../mod/admin.php:1064
+#: ../../mod/admin.php:1151 ../../mod/profiles.php:623
+#: ../../mod/invite.php:121 ../../addon/fromgplus/fromgplus.php:44
+#: ../../addon/facebook/facebook.php:621
 #: ../../addon/snautofollow/snautofollow.php:64
-#: ../../addon/fbpost/fbpost.php:272 ../../addon/yourls/yourls.php:76
+#: ../../addon/fbpost/fbpost.php:280 ../../addon/yourls/yourls.php:76
 #: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:88
 #: ../../addon/page/page.php:211 ../../addon/planets/planets.php:158
 #: ../../addon/uhremotestorage/uhremotestorage.php:89
 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
-#: ../../addon/remote_permissions/remote_permissions.php:47
-#: ../../addon/remote_permissions/remote_permissions.php:195
+#: ../../addon/remote_permissions/remote_permissions.php:48
+#: ../../addon/remote_permissions/remote_permissions.php:196
 #: ../../addon/startpage/startpage.php:92
 #: ../../addon/geonames/geonames.php:187
 #: ../../addon/forumlist/forumlist.php:178
@@ -179,27 +180,27 @@ msgstr "Neues Foto von dieser URL"
 #: ../../addon/libravatar/libravatar.php:99
 #: ../../addon/libertree/libertree.php:90 ../../addon/altpager/altpager.php:91
 #: ../../addon/altpager/altpager.php:98 ../../addon/mathjax/mathjax.php:42
-#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:98
+#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:99
 #: ../../addon/gravatar/gravatar.php:95
 #: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93
 #: ../../addon/jappixmini/jappixmini.php:307
-#: ../../addon/statusnet/statusnet.php:278
-#: ../../addon/statusnet/statusnet.php:292
-#: ../../addon/statusnet/statusnet.php:318
-#: ../../addon/statusnet/statusnet.php:325
-#: ../../addon/statusnet/statusnet.php:353
-#: ../../addon/statusnet/statusnet.php:700 ../../addon/tumblr/tumblr.php:233
+#: ../../addon/statusnet/statusnet.php:290
+#: ../../addon/statusnet/statusnet.php:304
+#: ../../addon/statusnet/statusnet.php:330
+#: ../../addon/statusnet/statusnet.php:337
+#: ../../addon/statusnet/statusnet.php:374
+#: ../../addon/statusnet/statusnet.php:752 ../../addon/tumblr/tumblr.php:233
 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88
 #: ../../addon/wppost/wppost.php:110 ../../addon/showmore/showmore.php:48
-#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180
-#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:506
+#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:191
+#: ../../addon/twitter/twitter.php:229 ../../addon/twitter/twitter.php:554
 #: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77
 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103
 #: ../../view/theme/cleanzero/config.php:80
 #: ../../view/theme/diabook/theme.php:642
 #: ../../view/theme/diabook/config.php:152
 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70
-#: ../../object/Item.php:577 ../../addon.old/fromgplus/fromgplus.php:40
+#: ../../object/Item.php:609 ../../addon.old/fromgplus/fromgplus.php:40
 #: ../../addon.old/facebook/facebook.php:619
 #: ../../addon.old/snautofollow/snautofollow.php:64
 #: ../../addon.old/bg/bg.php:90 ../../addon.old/fbpost/fbpost.php:226
@@ -299,86 +300,87 @@ msgstr "l, F j"
 msgid "Edit event"
 msgstr "Veranstaltung bearbeiten"
 
-#: ../../mod/events.php:323 ../../include/text.php:1190
+#: ../../mod/events.php:323 ../../include/text.php:1247
 msgid "link to source"
 msgstr "Link zum Originalbeitrag"
 
-#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91
-#: ../../include/nav.php:52 ../../boot.php:1761
+#: ../../mod/events.php:358 ../../view/theme/diabook/theme.php:91
+#: ../../include/nav.php:52 ../../boot.php:1805
 msgid "Events"
 msgstr "Veranstaltungen"
 
-#: ../../mod/events.php:348
+#: ../../mod/events.php:359
 msgid "Create New Event"
 msgstr "Neue Veranstaltung erstellen"
 
-#: ../../mod/events.php:349 ../../addon/dav/friendica/layout.fnk.php:263
+#: ../../mod/events.php:360 ../../addon/dav/friendica/layout.fnk.php:263
 #: ../../addon.old/dav/friendica/layout.fnk.php:263
 msgid "Previous"
 msgstr "Vorherige"
 
-#: ../../mod/events.php:350 ../../mod/install.php:205
+#: ../../mod/events.php:361 ../../mod/install.php:211
 #: ../../addon/dav/friendica/layout.fnk.php:266
 #: ../../addon.old/dav/friendica/layout.fnk.php:266
 msgid "Next"
 msgstr "Nächste"
 
-#: ../../mod/events.php:423
+#: ../../mod/events.php:434
 msgid "hour:minute"
 msgstr "Stunde:Minute"
 
-#: ../../mod/events.php:433
+#: ../../mod/events.php:444
 msgid "Event details"
 msgstr "Veranstaltungsdetails"
 
-#: ../../mod/events.php:434
+#: ../../mod/events.php:445
 #, php-format
 msgid "Format is %s %s. Starting date and Title are required."
 msgstr "Das Format ist %s %s. Beginnzeitpunkt und Titel werden benötigt."
 
-#: ../../mod/events.php:436
+#: ../../mod/events.php:447
 msgid "Event Starts:"
 msgstr "Veranstaltungsbeginn:"
 
-#: ../../mod/events.php:436 ../../mod/events.php:450
+#: ../../mod/events.php:447 ../../mod/events.php:461
 msgid "Required"
 msgstr "Benötigt"
 
-#: ../../mod/events.php:439
+#: ../../mod/events.php:450
 msgid "Finish date/time is not known or not relevant"
 msgstr "Enddatum/-zeit ist nicht bekannt oder nicht relevant"
 
-#: ../../mod/events.php:441
+#: ../../mod/events.php:452
 msgid "Event Finishes:"
 msgstr "Veranstaltungsende:"
 
-#: ../../mod/events.php:444
+#: ../../mod/events.php:455
 msgid "Adjust for viewer timezone"
 msgstr "An Zeitzone des Betrachters anpassen"
 
-#: ../../mod/events.php:446
+#: ../../mod/events.php:457
 msgid "Description:"
 msgstr "Beschreibung"
 
-#: ../../mod/events.php:448 ../../mod/directory.php:134
+#: ../../mod/events.php:459 ../../mod/directory.php:134
 #: ../../addon/forumdirectory/forumdirectory.php:156
 #: ../../include/event.php:40 ../../include/bb2diaspora.php:415
-#: ../../boot.php:1291
+#: ../../boot.php:1326
 msgid "Location:"
 msgstr "Ort:"
 
-#: ../../mod/events.php:450
+#: ../../mod/events.php:461
 msgid "Title:"
 msgstr "Titel:"
 
-#: ../../mod/events.php:452
+#: ../../mod/events.php:463
 msgid "Share this event"
 msgstr "Veranstaltung teilen"
 
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:145
-#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:561
-#: ../../mod/settings.php:587 ../../addon/js_upload/js_upload.php:45
-#: ../../include/conversation.php:1009
+#: ../../mod/dfrn_request.php:848 ../../mod/settings.php:561
+#: ../../mod/settings.php:587 ../../mod/fbrowser.php:81
+#: ../../mod/fbrowser.php:116 ../../addon/js_upload/js_upload.php:45
+#: ../../include/conversation.php:1045
 #: ../../addon.old/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -424,44 +426,44 @@ msgid ""
 " and/or create new posts for you?"
 msgstr "Möchtest du dieser Anwendung den Zugriff auf deine Beiträge und Kontakte, sowie das Erstellen neuer Beiträge in deinem Namen gestatten?"
 
-#: ../../mod/api.php:105 ../../mod/dfrn_request.php:835
+#: ../../mod/api.php:105 ../../mod/dfrn_request.php:836
 #: ../../mod/settings.php:934 ../../mod/settings.php:940
 #: ../../mod/settings.php:948 ../../mod/settings.php:952
 #: ../../mod/settings.php:957 ../../mod/settings.php:963
 #: ../../mod/settings.php:969 ../../mod/settings.php:975
 #: ../../mod/settings.php:1005 ../../mod/settings.php:1006
 #: ../../mod/settings.php:1007 ../../mod/settings.php:1008
-#: ../../mod/settings.php:1009 ../../mod/register.php:237
-#: ../../mod/profiles.php:584
+#: ../../mod/settings.php:1009 ../../mod/register.php:254
+#: ../../mod/profiles.php:603
 msgid "Yes"
 msgstr "Ja"
 
-#: ../../mod/api.php:106 ../../mod/dfrn_request.php:836
+#: ../../mod/api.php:106 ../../mod/dfrn_request.php:837
 #: ../../mod/settings.php:934 ../../mod/settings.php:940
 #: ../../mod/settings.php:948 ../../mod/settings.php:952
 #: ../../mod/settings.php:957 ../../mod/settings.php:963
 #: ../../mod/settings.php:969 ../../mod/settings.php:975
 #: ../../mod/settings.php:1005 ../../mod/settings.php:1006
 #: ../../mod/settings.php:1007 ../../mod/settings.php:1008
-#: ../../mod/settings.php:1009 ../../mod/register.php:238
-#: ../../mod/profiles.php:585
+#: ../../mod/settings.php:1009 ../../mod/register.php:255
+#: ../../mod/profiles.php:604
 msgid "No"
 msgstr "Nein"
 
-#: ../../mod/photos.php:51 ../../boot.php:1754
+#: ../../mod/photos.php:51 ../../boot.php:1798
 msgid "Photo Albums"
 msgstr "Fotoalben"
 
 #: ../../mod/photos.php:59 ../../mod/photos.php:154 ../../mod/photos.php:1009
-#: ../../mod/photos.php:1092 ../../mod/photos.php:1107
-#: ../../mod/photos.php:1562 ../../mod/photos.php:1574
-#: ../../addon/communityhome/communityhome.php:111
+#: ../../mod/photos.php:1102 ../../mod/photos.php:1125
+#: ../../mod/photos.php:1626 ../../mod/photos.php:1638
+#: ../../addon/communityhome/communityhome.php:115
 #: ../../view/theme/diabook/theme.php:492
 #: ../../addon.old/communityhome/communityhome.php:110
 msgid "Contact Photos"
 msgstr "Kontaktbilder"
 
-#: ../../mod/photos.php:66 ../../mod/photos.php:1123 ../../mod/photos.php:1612
+#: ../../mod/photos.php:66 ../../mod/photos.php:1141 ../../mod/photos.php:1685
 msgid "Upload New Photos"
 msgstr "Weitere Fotos hochladen"
 
@@ -473,14 +475,14 @@ msgstr "jeder"
 msgid "Contact information unavailable"
 msgstr "Kontaktinformationen nicht verfügbar"
 
-#: ../../mod/photos.php:154 ../../mod/photos.php:676 ../../mod/photos.php:1092
-#: ../../mod/photos.php:1107 ../../mod/profile_photo.php:74
+#: ../../mod/photos.php:154 ../../mod/photos.php:676 ../../mod/photos.php:1102
+#: ../../mod/photos.php:1125 ../../mod/profile_photo.php:74
 #: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88
 #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
 #: ../../mod/profile_photo.php:305
-#: ../../addon/communityhome/communityhome.php:112
-#: ../../view/theme/diabook/theme.php:493 ../../include/user.php:324
-#: ../../include/user.php:331 ../../include/user.php:338
+#: ../../addon/communityhome/communityhome.php:116
+#: ../../view/theme/diabook/theme.php:493 ../../include/user.php:325
+#: ../../include/user.php:332 ../../include/user.php:339
 #: ../../addon.old/communityhome/communityhome.php:111
 msgid "Profile Photos"
 msgstr "Profilbilder"
@@ -489,11 +491,11 @@ msgstr "Profilbilder"
 msgid "Album not found."
 msgstr "Album nicht gefunden."
 
-#: ../../mod/photos.php:182 ../../mod/photos.php:1101
+#: ../../mod/photos.php:182 ../../mod/photos.php:1119
 msgid "Delete Album"
 msgstr "Album löschen"
 
-#: ../../mod/photos.php:245 ../../mod/photos.php:1364
+#: ../../mod/photos.php:245 ../../mod/photos.php:1403
 msgid "Delete Photo"
 msgstr "Foto löschen"
 
@@ -526,7 +528,7 @@ msgid "Image upload failed."
 msgstr "Hochladen des Bildes gescheitert."
 
 #: ../../mod/photos.php:865 ../../mod/community.php:18
-#: ../../mod/dfrn_request.php:760 ../../mod/viewcontacts.php:17
+#: ../../mod/dfrn_request.php:761 ../../mod/viewcontacts.php:17
 #: ../../mod/display.php:7 ../../mod/search.php:89 ../../mod/directory.php:31
 #: ../../addon/forumdirectory/forumdirectory.php:53
 msgid "Public access denied."
@@ -545,157 +547,157 @@ msgstr "Zugriff zu diesem Eintrag wurde eingeschränkt."
 msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
 msgstr "Du verwendest %1$.2f Mbyte von %2$.2f Mbyte des Foto-Speichers."
 
-#: ../../mod/photos.php:1043
+#: ../../mod/photos.php:1053
 msgid "Upload Photos"
 msgstr "Bilder hochladen"
 
-#: ../../mod/photos.php:1047 ../../mod/photos.php:1096
+#: ../../mod/photos.php:1057 ../../mod/photos.php:1114
 msgid "New album name: "
 msgstr "Name des neuen Albums: "
 
-#: ../../mod/photos.php:1048
+#: ../../mod/photos.php:1058
 msgid "or existing album name: "
 msgstr "oder existierender Albumname: "
 
-#: ../../mod/photos.php:1049
+#: ../../mod/photos.php:1059
 msgid "Do not show a status post for this upload"
 msgstr "Keine Status-Mitteilung für diesen Beitrag anzeigen"
 
-#: ../../mod/photos.php:1051 ../../mod/photos.php:1359
+#: ../../mod/photos.php:1061 ../../mod/photos.php:1398
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: ../../mod/photos.php:1111
+#: ../../mod/photos.php:1129
 msgid "Edit Album"
 msgstr "Album bearbeiten"
 
-#: ../../mod/photos.php:1117
+#: ../../mod/photos.php:1135
 msgid "Show Newest First"
 msgstr "Zeige neueste zuerst"
 
-#: ../../mod/photos.php:1119
+#: ../../mod/photos.php:1137
 msgid "Show Oldest First"
 msgstr "Zeige älteste zuerst"
 
-#: ../../mod/photos.php:1143 ../../mod/photos.php:1595
+#: ../../mod/photos.php:1170 ../../mod/photos.php:1668
 msgid "View Photo"
 msgstr "Fotos betrachten"
 
-#: ../../mod/photos.php:1178
+#: ../../mod/photos.php:1205
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "Zugriff verweigert. Zugriff zu diesem Eintrag könnte eingeschränkt sein."
 
-#: ../../mod/photos.php:1180
+#: ../../mod/photos.php:1207
 msgid "Photo not available"
 msgstr "Foto nicht verfügbar"
 
-#: ../../mod/photos.php:1236
+#: ../../mod/photos.php:1263
 msgid "View photo"
 msgstr "Fotos ansehen"
 
-#: ../../mod/photos.php:1236
+#: ../../mod/photos.php:1263
 msgid "Edit photo"
 msgstr "Foto bearbeiten"
 
-#: ../../mod/photos.php:1237
+#: ../../mod/photos.php:1264
 msgid "Use as profile photo"
 msgstr "Als Profilbild verwenden"
 
-#: ../../mod/photos.php:1243 ../../mod/content.php:603
+#: ../../mod/photos.php:1270 ../../mod/content.php:620
 #: ../../object/Item.php:105
 msgid "Private Message"
 msgstr "Private Nachricht"
 
-#: ../../mod/photos.php:1262
+#: ../../mod/photos.php:1289
 msgid "View Full Size"
 msgstr "Betrachte Originalgröße"
 
-#: ../../mod/photos.php:1336
+#: ../../mod/photos.php:1363
 msgid "Tags: "
 msgstr "Tags: "
 
-#: ../../mod/photos.php:1339
+#: ../../mod/photos.php:1366
 msgid "[Remove any tag]"
 msgstr "[Tag entfernen]"
 
-#: ../../mod/photos.php:1349
+#: ../../mod/photos.php:1388
 msgid "Rotate CW (right)"
 msgstr "Drehen US (rechts)"
 
-#: ../../mod/photos.php:1350
+#: ../../mod/photos.php:1389
 msgid "Rotate CCW (left)"
 msgstr "Drehen EUS (links)"
 
-#: ../../mod/photos.php:1352
+#: ../../mod/photos.php:1391
 msgid "New album name"
 msgstr "Name des neuen Albums"
 
-#: ../../mod/photos.php:1355
+#: ../../mod/photos.php:1394
 msgid "Caption"
 msgstr "Bildunterschrift"
 
-#: ../../mod/photos.php:1357
+#: ../../mod/photos.php:1396
 msgid "Add a Tag"
 msgstr "Tag hinzufügen"
 
-#: ../../mod/photos.php:1361
+#: ../../mod/photos.php:1400
 msgid ""
 "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 
-#: ../../mod/photos.php:1381 ../../mod/content.php:667
+#: ../../mod/photos.php:1420 ../../mod/content.php:684
 #: ../../object/Item.php:203
 msgid "I like this (toggle)"
 msgstr "Ich mag das (toggle)"
 
-#: ../../mod/photos.php:1382 ../../mod/content.php:668
+#: ../../mod/photos.php:1421 ../../mod/content.php:685
 #: ../../object/Item.php:204
 msgid "I don't like this (toggle)"
 msgstr "Ich mag das nicht (toggle)"
 
-#: ../../mod/photos.php:1383 ../../include/conversation.php:969
+#: ../../mod/photos.php:1422 ../../include/conversation.php:1005
 msgid "Share"
 msgstr "Teilen"
 
-#: ../../mod/photos.php:1384 ../../mod/editpost.php:121
-#: ../../mod/content.php:482 ../../mod/content.php:848
+#: ../../mod/photos.php:1423 ../../mod/editpost.php:121
+#: ../../mod/content.php:499 ../../mod/content.php:883
 #: ../../mod/wallmessage.php:152 ../../mod/message.php:300
-#: ../../mod/message.php:488 ../../include/conversation.php:624
-#: ../../include/conversation.php:988 ../../object/Item.php:270
+#: ../../mod/message.php:528 ../../include/conversation.php:645
+#: ../../include/conversation.php:1024 ../../object/Item.php:292
 msgid "Please wait"
 msgstr "Bitte warten"
 
-#: ../../mod/photos.php:1400 ../../mod/photos.php:1444
-#: ../../mod/photos.php:1516 ../../mod/content.php:690
-#: ../../object/Item.php:574
+#: ../../mod/photos.php:1439 ../../mod/photos.php:1483
+#: ../../mod/photos.php:1566 ../../mod/content.php:707
+#: ../../object/Item.php:606
 msgid "This is you"
 msgstr "Das bist du"
 
-#: ../../mod/photos.php:1402 ../../mod/photos.php:1446
-#: ../../mod/photos.php:1518 ../../mod/content.php:692 ../../boot.php:621
-#: ../../object/Item.php:267 ../../object/Item.php:576
+#: ../../mod/photos.php:1441 ../../mod/photos.php:1485
+#: ../../mod/photos.php:1568 ../../mod/content.php:709 ../../boot.php:635
+#: ../../object/Item.php:289 ../../object/Item.php:608
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../../mod/photos.php:1404 ../../mod/photos.php:1448
-#: ../../mod/photos.php:1520 ../../mod/editpost.php:142
-#: ../../mod/content.php:702 ../../include/conversation.php:1006
-#: ../../object/Item.php:586
+#: ../../mod/photos.php:1443 ../../mod/photos.php:1487
+#: ../../mod/photos.php:1570 ../../mod/editpost.php:142
+#: ../../mod/content.php:719 ../../include/conversation.php:1042
+#: ../../object/Item.php:618
 msgid "Preview"
 msgstr "Vorschau"
 
-#: ../../mod/photos.php:1488 ../../mod/content.php:439
-#: ../../mod/content.php:724 ../../mod/settings.php:623
-#: ../../mod/group.php:168 ../../mod/admin.php:699
+#: ../../mod/photos.php:1527 ../../mod/content.php:439
+#: ../../mod/content.php:741 ../../mod/settings.php:623
+#: ../../mod/group.php:171 ../../mod/admin.php:735
 #: ../../include/conversation.php:569 ../../object/Item.php:119
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../../mod/photos.php:1601
+#: ../../mod/photos.php:1674
 msgid "View Album"
 msgstr "Album betrachten"
 
-#: ../../mod/photos.php:1610
+#: ../../mod/photos.php:1683
 msgid "Recent Photos"
 msgstr "Neueste Fotos"
 
@@ -753,96 +755,96 @@ msgstr "Beitrag nicht gefunden"
 msgid "Edit post"
 msgstr "Beitrag bearbeiten"
 
-#: ../../mod/editpost.php:91 ../../include/conversation.php:955
+#: ../../mod/editpost.php:91 ../../include/conversation.php:991
 msgid "Post to Email"
 msgstr "An E-Mail senden"
 
-#: ../../mod/editpost.php:106 ../../mod/content.php:711
+#: ../../mod/editpost.php:106 ../../mod/content.php:728
 #: ../../mod/settings.php:622 ../../object/Item.php:109
 msgid "Edit"
 msgstr "Bearbeiten"
 
 #: ../../mod/editpost.php:107 ../../mod/wallmessage.php:150
-#: ../../mod/message.php:298 ../../mod/message.php:485
-#: ../../include/conversation.php:970
+#: ../../mod/message.php:298 ../../mod/message.php:525
+#: ../../include/conversation.php:1006
 msgid "Upload photo"
 msgstr "Foto hochladen"
 
-#: ../../mod/editpost.php:108 ../../include/conversation.php:971
+#: ../../mod/editpost.php:108 ../../include/conversation.php:1007
 msgid "upload photo"
 msgstr "Bild hochladen"
 
-#: ../../mod/editpost.php:109 ../../include/conversation.php:972
+#: ../../mod/editpost.php:109 ../../include/conversation.php:1008
 msgid "Attach file"
 msgstr "Datei anhängen"
 
-#: ../../mod/editpost.php:110 ../../include/conversation.php:973
+#: ../../mod/editpost.php:110 ../../include/conversation.php:1009
 msgid "attach file"
 msgstr "Datei anhängen"
 
 #: ../../mod/editpost.php:111 ../../mod/wallmessage.php:151
-#: ../../mod/message.php:299 ../../mod/message.php:486
-#: ../../include/conversation.php:974
+#: ../../mod/message.php:299 ../../mod/message.php:526
+#: ../../include/conversation.php:1010
 msgid "Insert web link"
 msgstr "einen Link einfügen"
 
-#: ../../mod/editpost.php:112 ../../include/conversation.php:975
+#: ../../mod/editpost.php:112 ../../include/conversation.php:1011
 msgid "web link"
 msgstr "Weblink"
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:976
+#: ../../mod/editpost.php:113 ../../include/conversation.php:1012
 msgid "Insert video link"
 msgstr "Video-Adresse einfügen"
 
-#: ../../mod/editpost.php:114 ../../include/conversation.php:977
+#: ../../mod/editpost.php:114 ../../include/conversation.php:1013
 msgid "video link"
 msgstr "Video-Link"
 
-#: ../../mod/editpost.php:115 ../../include/conversation.php:978
+#: ../../mod/editpost.php:115 ../../include/conversation.php:1014
 msgid "Insert audio link"
 msgstr "Audio-Adresse einfügen"
 
-#: ../../mod/editpost.php:116 ../../include/conversation.php:979
+#: ../../mod/editpost.php:116 ../../include/conversation.php:1015
 msgid "audio link"
 msgstr "Audio-Link"
 
-#: ../../mod/editpost.php:117 ../../include/conversation.php:980
+#: ../../mod/editpost.php:117 ../../include/conversation.php:1016
 msgid "Set your location"
 msgstr "Deinen Standort festlegen"
 
-#: ../../mod/editpost.php:118 ../../include/conversation.php:981
+#: ../../mod/editpost.php:118 ../../include/conversation.php:1017
 msgid "set location"
 msgstr "Ort setzen"
 
-#: ../../mod/editpost.php:119 ../../include/conversation.php:982
+#: ../../mod/editpost.php:119 ../../include/conversation.php:1018
 msgid "Clear browser location"
 msgstr "Browser-Standort leeren"
 
-#: ../../mod/editpost.php:120 ../../include/conversation.php:983
+#: ../../mod/editpost.php:120 ../../include/conversation.php:1019
 msgid "clear location"
 msgstr "Ort löschen"
 
-#: ../../mod/editpost.php:122 ../../include/conversation.php:989
+#: ../../mod/editpost.php:122 ../../include/conversation.php:1025
 msgid "Permission settings"
 msgstr "Berechtigungseinstellungen"
 
-#: ../../mod/editpost.php:130 ../../include/conversation.php:998
+#: ../../mod/editpost.php:130 ../../include/conversation.php:1034
 msgid "CC: email addresses"
 msgstr "Cc:-E-Mail-Addressen"
 
-#: ../../mod/editpost.php:131 ../../include/conversation.php:999
+#: ../../mod/editpost.php:131 ../../include/conversation.php:1035
 msgid "Public post"
 msgstr "Öffentlicher Beitrag"
 
-#: ../../mod/editpost.php:134 ../../include/conversation.php:985
+#: ../../mod/editpost.php:134 ../../include/conversation.php:1021
 msgid "Set title"
 msgstr "Titel setzen"
 
-#: ../../mod/editpost.php:136 ../../include/conversation.php:987
+#: ../../mod/editpost.php:136 ../../include/conversation.php:1023
 msgid "Categories (comma-separated list)"
 msgstr "Kategorien (kommasepariert)"
 
-#: ../../mod/editpost.php:137 ../../include/conversation.php:1001
+#: ../../mod/editpost.php:137 ../../include/conversation.php:1037
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Z.B.: bob@example.com, mary@example.com"
 
@@ -850,19 +852,19 @@ msgstr "Z.B.: bob@example.com, mary@example.com"
 msgid "This introduction has already been accepted."
 msgstr "Diese Kontaktanfrage wurde bereits akzeptiert."
 
-#: ../../mod/dfrn_request.php:118 ../../mod/dfrn_request.php:512
+#: ../../mod/dfrn_request.php:118 ../../mod/dfrn_request.php:513
 msgid "Profile location is not valid or does not contain profile information."
 msgstr "Profiladresse ist ungültig oder stellt einige Profildaten nicht zur Verfügung."
 
-#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:517
+#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:518
 msgid "Warning: profile location has no identifiable owner name."
 msgstr "Warnung: Es konnte kein Name des Besitzers von der angegebenen Profiladresse gefunden werden."
 
-#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:519
+#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:520
 msgid "Warning: profile location has no profile photo."
 msgstr "Warnung: Es konnte kein Profilbild bei der angegebenen Profiladresse gefunden werden."
 
-#: ../../mod/dfrn_request.php:128 ../../mod/dfrn_request.php:522
+#: ../../mod/dfrn_request.php:128 ../../mod/dfrn_request.php:523
 #, php-format
 msgid "%d required parameter was not found at the given location"
 msgid_plural "%d required parameters were not found at the given location"
@@ -902,136 +904,136 @@ msgstr "Ungültiger Locator"
 msgid "Invalid email address."
 msgstr "Ungültige E-Mail Adresse."
 
-#: ../../mod/dfrn_request.php:361
+#: ../../mod/dfrn_request.php:362
 msgid "This account has not been configured for email. Request failed."
 msgstr "Dieses Konto ist nicht für E-Mail konfiguriert. Anfrage fehlgeschlagen."
 
-#: ../../mod/dfrn_request.php:457
+#: ../../mod/dfrn_request.php:458
 msgid "Unable to resolve your name at the provided location."
 msgstr "Konnte deinen Namen an der angegebenen Stelle nicht finden."
 
-#: ../../mod/dfrn_request.php:470
+#: ../../mod/dfrn_request.php:471
 msgid "You have already introduced yourself here."
 msgstr "Du hast dich hier bereits vorgestellt."
 
-#: ../../mod/dfrn_request.php:474
+#: ../../mod/dfrn_request.php:475
 #, php-format
 msgid "Apparently you are already friends with %s."
 msgstr "Es scheint so, als ob du bereits mit %s befreundet bist."
 
-#: ../../mod/dfrn_request.php:495
+#: ../../mod/dfrn_request.php:496
 msgid "Invalid profile URL."
 msgstr "Ungültige Profil-URL."
 
-#: ../../mod/dfrn_request.php:501 ../../include/follow.php:27
+#: ../../mod/dfrn_request.php:502 ../../include/follow.php:27
 msgid "Disallowed profile URL."
 msgstr "Nicht erlaubte Profil-URL."
 
-#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:124
+#: ../../mod/dfrn_request.php:571 ../../mod/contacts.php:124
 msgid "Failed to update contact record."
 msgstr "Aktualisierung der Kontaktdaten fehlgeschlagen."
 
-#: ../../mod/dfrn_request.php:591
+#: ../../mod/dfrn_request.php:592
 msgid "Your introduction has been sent."
 msgstr "Deine Kontaktanfrage wurde gesendet."
 
-#: ../../mod/dfrn_request.php:644
+#: ../../mod/dfrn_request.php:645
 msgid "Please login to confirm introduction."
 msgstr "Bitte melde dich an, um die Kontaktanfrage zu bestätigen."
 
-#: ../../mod/dfrn_request.php:658
+#: ../../mod/dfrn_request.php:659
 msgid ""
 "Incorrect identity currently logged in. Please login to "
 "<strong>this</strong> profile."
 msgstr "Momentan bist du mit einer anderen Identität angemeldet. Bitte melde Dich mit <strong>diesem</strong> Profil an."
 
-#: ../../mod/dfrn_request.php:669
+#: ../../mod/dfrn_request.php:670
 msgid "Hide this contact"
 msgstr "Verberge diesen Kontakt"
 
-#: ../../mod/dfrn_request.php:672
+#: ../../mod/dfrn_request.php:673
 #, php-format
 msgid "Welcome home %s."
 msgstr "Willkommen zurück %s."
 
-#: ../../mod/dfrn_request.php:673
+#: ../../mod/dfrn_request.php:674
 #, php-format
 msgid "Please confirm your introduction/connection request to %s."
 msgstr "Bitte bestätige deine Kontaktanfrage bei %s."
 
-#: ../../mod/dfrn_request.php:674
+#: ../../mod/dfrn_request.php:675
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#: ../../mod/dfrn_request.php:715 ../../include/items.php:3356
+#: ../../mod/dfrn_request.php:716 ../../include/items.php:3370
 msgid "[Name Withheld]"
 msgstr "[Name unterdrückt]"
 
-#: ../../mod/dfrn_request.php:810
+#: ../../mod/dfrn_request.php:811
 msgid ""
 "Please enter your 'Identity Address' from one of the following supported "
 "communications networks:"
 msgstr "Bitte gib die Adresse deines Profils in einem der unterstützten sozialen Netzwerke an:"
 
-#: ../../mod/dfrn_request.php:826
+#: ../../mod/dfrn_request.php:827
 msgid "<strike>Connect as an email follower</strike> (Coming soon)"
 msgstr "<strike>Als E-Mail-Kontakt verbinden</strike> (In Kürze verfügbar)"
 
-#: ../../mod/dfrn_request.php:828
+#: ../../mod/dfrn_request.php:829
 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 "Wenn du noch kein Mitglied dieses freien sozialen Netzwerks bist, <a href=\"http://dir.friendica.com/siteinfo\">folge diesem Link</a> um einen öffentlichen Friendica-Server zu finden und beizutreten."
 
-#: ../../mod/dfrn_request.php:831
+#: ../../mod/dfrn_request.php:832
 msgid "Friend/Connection Request"
 msgstr "Freundschafts-/Kontaktanfrage"
 
-#: ../../mod/dfrn_request.php:832
+#: ../../mod/dfrn_request.php:833
 msgid ""
 "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
 "testuser@identi.ca"
 msgstr "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"
 
-#: ../../mod/dfrn_request.php:833
+#: ../../mod/dfrn_request.php:834
 msgid "Please answer the following:"
 msgstr "Bitte beantworte Folgendes:"
 
-#: ../../mod/dfrn_request.php:834
+#: ../../mod/dfrn_request.php:835
 #, php-format
 msgid "Does %s know you?"
 msgstr "Kennt %s dich?"
 
-#: ../../mod/dfrn_request.php:837
+#: ../../mod/dfrn_request.php:838
 msgid "Add a personal note:"
 msgstr "Eine persönliche Notiz beifügen:"
 
-#: ../../mod/dfrn_request.php:839 ../../include/contact_selectors.php:76
+#: ../../mod/dfrn_request.php:840 ../../include/contact_selectors.php:76
 msgid "Friendica"
 msgstr "Friendica"
 
-#: ../../mod/dfrn_request.php:840
+#: ../../mod/dfrn_request.php:841
 msgid "StatusNet/Federated Social Web"
 msgstr "StatusNet/Federated Social Web"
 
-#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:682
+#: ../../mod/dfrn_request.php:842 ../../mod/settings.php:681
 #: ../../include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr "Diaspora"
 
-#: ../../mod/dfrn_request.php:842
+#: ../../mod/dfrn_request.php:843
 #, php-format
 msgid ""
 " - please do not use this form.  Instead, enter %s into your Diaspora search"
 " bar."
 msgstr " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in deiner Diaspora Suchleiste."
 
-#: ../../mod/dfrn_request.php:843
+#: ../../mod/dfrn_request.php:844
 msgid "Your Identity Address:"
 msgstr "Adresse deines Profils:"
 
-#: ../../mod/dfrn_request.php:846
+#: ../../mod/dfrn_request.php:847
 msgid "Submit Request"
 msgstr "Anfrage abschicken"
 
@@ -1064,7 +1066,7 @@ msgid "Remove account"
 msgstr "Konto löschen"
 
 #: ../../mod/uexport.php:48 ../../mod/settings.php:74
-#: ../../mod/newmember.php:22 ../../mod/admin.php:788 ../../mod/admin.php:993
+#: ../../mod/newmember.php:22 ../../mod/admin.php:824 ../../mod/admin.php:1029
 #: ../../addon/dav/friendica/layout.fnk.php:225
 #: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537
 #: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:140
@@ -1094,255 +1096,284 @@ msgid ""
 "of your account (photos are not exported)"
 msgstr "Exportiere deine Account Informationen, Kontakte und alle Einträge als JSON Datei. Dies könnte eine sehr große Datei werden und dementsprechend viel Zeit benötigen. Verwende dies um ein komplettes Backup deines Accounts anzulegen (Photos werden nicht exportiert)."
 
-#: ../../mod/install.php:117
+#: ../../mod/install.php:121
 msgid "Friendica Social Communications Server - Setup"
 msgstr "Friendica-Server für soziale Netzwerke – Setup"
 
-#: ../../mod/install.php:123
+#: ../../mod/install.php:127
 msgid "Could not connect to database."
 msgstr "Verbindung zur Datenbank gescheitert"
 
-#: ../../mod/install.php:127
+#: ../../mod/install.php:131
 msgid "Could not create table."
 msgstr "Konnte Tabelle nicht erstellen."
 
-#: ../../mod/install.php:133
+#: ../../mod/install.php:137
 msgid "Your Friendica site database has been installed."
 msgstr "Die Datenbank deiner Friendicaseite wurde installiert."
 
-#: ../../mod/install.php:138
+#: ../../mod/install.php:142
 msgid ""
 "You may need to import the file \"database.sql\" manually using phpmyadmin "
 "or mysql."
 msgstr "Möglicherweise musst du die Datei \"database.sql\" manuell mit phpmyadmin oder mysql importieren."
 
-#: ../../mod/install.php:139 ../../mod/install.php:204
-#: ../../mod/install.php:488
+#: ../../mod/install.php:143 ../../mod/install.php:210
+#: ../../mod/install.php:510
 msgid "Please see the file \"INSTALL.txt\"."
 msgstr "Lies bitte die \"INSTALL.txt\"."
 
-#: ../../mod/install.php:201
+#: ../../mod/install.php:207
 msgid "System check"
 msgstr "Systemtest"
 
-#: ../../mod/install.php:206
+#: ../../mod/install.php:212
 msgid "Check again"
 msgstr "Noch einmal testen"
 
-#: ../../mod/install.php:225
+#: ../../mod/install.php:231
 msgid "Database connection"
 msgstr "Datenbankverbindung"
 
-#: ../../mod/install.php:226
+#: ../../mod/install.php:232
 msgid ""
 "In order to install Friendica we need to know how to connect to your "
 "database."
 msgstr "Um Friendica installieren zu können, müssen wir wissen, wie wir zu deiner Datenbank Kontakt aufnehmen können."
 
-#: ../../mod/install.php:227
+#: ../../mod/install.php:233
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
 msgstr "Bitte kontaktiere den Hosting Provider oder den Administrator der Seite, falls du Fragen zu diesen Einstellungen haben solltest."
 
-#: ../../mod/install.php:228
+#: ../../mod/install.php:234
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
 msgstr "Die Datenbank, die du unten angibst, sollte bereits existieren. Ist dies noch nicht der Fall, erzeuge sie bitte bevor du mit der Installation fortfährst."
 
-#: ../../mod/install.php:232
+#: ../../mod/install.php:238
 msgid "Database Server Name"
 msgstr "Datenbank-Server"
 
-#: ../../mod/install.php:233
+#: ../../mod/install.php:239
 msgid "Database Login Name"
 msgstr "Datenbank-Nutzer"
 
-#: ../../mod/install.php:234
+#: ../../mod/install.php:240
 msgid "Database Login Password"
 msgstr "Datenbank-Passwort"
 
-#: ../../mod/install.php:235
+#: ../../mod/install.php:241
 msgid "Database Name"
 msgstr "Datenbank-Name"
 
-#: ../../mod/install.php:236 ../../mod/install.php:275
+#: ../../mod/install.php:242 ../../mod/install.php:281
 msgid "Site administrator email address"
 msgstr "E-Mail-Adresse des Administrators"
 
-#: ../../mod/install.php:236 ../../mod/install.php:275
+#: ../../mod/install.php:242 ../../mod/install.php:281
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
 msgstr "Die E-Mail-Adresse, die in deinem Friendica-Account eingetragen ist, muss mit dieser Adresse übereinstimmen, damit du das Admin-Panel benutzen kannst."
 
-#: ../../mod/install.php:240 ../../mod/install.php:278
+#: ../../mod/install.php:246 ../../mod/install.php:284
 msgid "Please select a default timezone for your website"
 msgstr "Bitte wähle die Standardzeitzone deiner Webseite"
 
-#: ../../mod/install.php:265
+#: ../../mod/install.php:271
 msgid "Site settings"
 msgstr "Server-Einstellungen"
 
-#: ../../mod/install.php:318
+#: ../../mod/install.php:324
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr "Konnte keine Kommandozeilenversion von PHP im PATH des Servers finden."
 
-#: ../../mod/install.php:319
+#: ../../mod/install.php:325
 msgid ""
 "If you don't have a command line version of PHP installed on server, you "
 "will not be able to run background polling via cron. See <a "
 "href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>"
 msgstr "Wenn du keine Kommandozeilen Version von PHP auf deinem Server installiert hast, kannst du keine Hintergrundprozesse via cron starten. Siehe <a href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>"
 
-#: ../../mod/install.php:323
+#: ../../mod/install.php:329
 msgid "PHP executable path"
 msgstr "Pfad zu PHP"
 
-#: ../../mod/install.php:323
+#: ../../mod/install.php:329
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr "Gib den kompletten Pfad zur ausführbaren Datei von PHP an. Du kannst dieses Feld auch frei lassen und mit der Installation fortfahren."
 
-#: ../../mod/install.php:328
+#: ../../mod/install.php:334
 msgid "Command line PHP"
 msgstr "Kommandozeilen-PHP"
 
-#: ../../mod/install.php:337
+#: ../../mod/install.php:343
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr "Die Kommandozeilenversion von PHP auf deinem System hat \"register_argc_argv\" nicht aktiviert."
 
-#: ../../mod/install.php:338
+#: ../../mod/install.php:344
 msgid "This is required for message delivery to work."
 msgstr "Dies wird für die Auslieferung von Nachrichten benötigt."
 
-#: ../../mod/install.php:340
+#: ../../mod/install.php:346
 msgid "PHP register_argc_argv"
 msgstr "PHP register_argc_argv"
 
-#: ../../mod/install.php:361
+#: ../../mod/install.php:367
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr "Fehler: Die Funktion \"openssl_pkey_new\" auf diesem System ist nicht in der Lage, Verschlüsselungsschlüssel zu erzeugen"
 
-#: ../../mod/install.php:362
+#: ../../mod/install.php:368
 msgid ""
 "If running under Windows, please see "
 "\"http://www.php.net/manual/en/openssl.installation.php\"."
 msgstr "Wenn der Server unter Windows läuft, schau dir bitte \"http://www.php.net/manual/en/openssl.installation.php\" an."
 
-#: ../../mod/install.php:364
+#: ../../mod/install.php:370
 msgid "Generate encryption keys"
 msgstr "Schlüssel erzeugen"
 
-#: ../../mod/install.php:371
+#: ../../mod/install.php:377
 msgid "libCurl PHP module"
 msgstr "PHP: libCurl-Modul"
 
-#: ../../mod/install.php:372
+#: ../../mod/install.php:378
 msgid "GD graphics PHP module"
 msgstr "PHP: GD-Grafikmodul"
 
-#: ../../mod/install.php:373
+#: ../../mod/install.php:379
 msgid "OpenSSL PHP module"
 msgstr "PHP: OpenSSL-Modul"
 
-#: ../../mod/install.php:374
+#: ../../mod/install.php:380
 msgid "mysqli PHP module"
 msgstr "PHP: mysqli-Modul"
 
-#: ../../mod/install.php:375
+#: ../../mod/install.php:381
 msgid "mb_string PHP module"
 msgstr "PHP: mb_string-Modul"
 
-#: ../../mod/install.php:380 ../../mod/install.php:382
+#: ../../mod/install.php:386 ../../mod/install.php:388
 msgid "Apache mod_rewrite module"
 msgstr "Apache mod_rewrite module"
 
-#: ../../mod/install.php:380
+#: ../../mod/install.php:386
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr "Fehler: Das Apache-Modul mod-rewrite wird benötigt, es ist allerdings nicht installiert."
 
-#: ../../mod/install.php:388
+#: ../../mod/install.php:394
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "Fehler: Das libCURL PHP Modul wird benötigt, ist aber nicht installiert."
 
-#: ../../mod/install.php:392
+#: ../../mod/install.php:398
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr "Fehler: Das GD-Graphikmodul für PHP mit JPEG-Unterstützung ist nicht installiert."
 
-#: ../../mod/install.php:396
+#: ../../mod/install.php:402
 msgid "Error: openssl PHP module required but not installed."
 msgstr "Fehler: Das openssl-Modul von PHP ist nicht installiert."
 
-#: ../../mod/install.php:400
+#: ../../mod/install.php:406
 msgid "Error: mysqli PHP module required but not installed."
 msgstr "Fehler: Das mysqli-Modul von PHP ist nicht installiert."
 
-#: ../../mod/install.php:404
+#: ../../mod/install.php:410
 msgid "Error: mb_string PHP module required but not installed."
 msgstr "Fehler: mb_string PHP Module wird benötigt ist aber nicht installiert."
 
-#: ../../mod/install.php:421
+#: ../../mod/install.php:427
 msgid ""
 "The web installer needs to be able to create a file called \".htconfig.php\""
 " in the top folder of your web server and it is unable to do so."
 msgstr "Der Installationswizard muss in der Lage sein, eine Datei im Stammverzeichnis deines Webservers anzulegen, ist allerdings derzeit nicht in der Lage, dies zu tun."
 
-#: ../../mod/install.php:422
+#: ../../mod/install.php:428
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
 msgstr "In den meisten Fällen ist dies ein Problem mit den Schreibrechten. Der Webserver könnte keine Schreiberlaubnis haben, selbst wenn du sie hast."
 
-#: ../../mod/install.php:423
+#: ../../mod/install.php:429
 msgid ""
 "At the end of this procedure, we will give you a text to save in a file "
 "named .htconfig.php in your Friendica top folder."
 msgstr "Nachdem du alles ausgefüllt hast, erhältst du einen Text, den du in eine Datei namens .htconfig.php in deinem Friendica-Wurzelverzeichnis kopieren musst."
 
-#: ../../mod/install.php:424
+#: ../../mod/install.php:430
 msgid ""
 "You can alternatively skip this procedure and perform a manual installation."
 " Please see the file \"INSTALL.txt\" for instructions."
 msgstr "Alternativ kannst du diesen Schritt aber auch überspringen und die Installation manuell durchführen. Eine Anleitung dazu (Englisch) findest du in der Datei INSTALL.txt."
 
-#: ../../mod/install.php:427
+#: ../../mod/install.php:433
 msgid ".htconfig.php is writable"
 msgstr "Schreibrechte auf .htconfig.php"
 
-#: ../../mod/install.php:439
+#: ../../mod/install.php:443
+msgid ""
+"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
+msgstr "Friendica nutzt die Smarty3 Template Engine um die Webansichten zu rendern. Smarty3 kompiliert Templates zu PHP um das Rendern zu beschleunigen."
+
+#: ../../mod/install.php:444
+msgid ""
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory view/smarty3/ under the Friendica top level "
+"folder."
+msgstr "Um diese kompilierten Templates zu speichern benötigt der Webserver Schreibrechte zum Verzeichnis view/smarty3/ im obersten Ordner von Friendica."
+
+#: ../../mod/install.php:445
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has"
+" write access to this folder."
+msgstr "Bitte stelle sicher, dass der Nutzer unter dem der Webserver läuft (z.B. www-data) Schreibrechte zu diesem Verzeichnis hat."
+
+#: ../../mod/install.php:446
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"view/smarty3/ only--not the template files (.tpl) that it contains."
+msgstr "Hinweis: aus Sicherheitsgründen solltest du dem Webserver nur Schreibrechte für view/smarty3/ geben -- Nicht den Templatedateien (.tpl) die sie enthalten."
+
+#: ../../mod/install.php:449
+msgid "view/smarty3 is writable"
+msgstr "view/smarty3 ist schreibbar"
+
+#: ../../mod/install.php:461
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server configuration."
 msgstr "Umschreiben der URLs in der .htaccess funktioniert nicht. Überprüfe die Konfiguration des Servers."
 
-#: ../../mod/install.php:441
+#: ../../mod/install.php:463
 msgid "Url rewrite is working"
 msgstr "URL rewrite funktioniert"
 
-#: ../../mod/install.php:451
+#: ../../mod/install.php:473
 msgid ""
 "The database configuration file \".htconfig.php\" could not be written. "
 "Please use the enclosed text to create a configuration file in your web "
 "server root."
 msgstr "Die Konfigurationsdatei \".htconfig.php\" konnte nicht angelegt werden. Bitte verwende den angefügten Text, um die Datei im Stammverzeichnis deiner Friendica-Installation zu erzeugen."
 
-#: ../../mod/install.php:475
+#: ../../mod/install.php:497
 msgid "Errors encountered creating database tables."
 msgstr "Fehler aufgetreten während der Erzeugung der Datenbanktabellen."
 
-#: ../../mod/install.php:486
+#: ../../mod/install.php:508
 msgid "<h1>What next</h1>"
 msgstr "<h1>Wie geht es weiter?</h1>"
 
-#: ../../mod/install.php:487
+#: ../../mod/install.php:509
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the "
 "poller."
@@ -1415,7 +1446,7 @@ msgid "is interested in:"
 msgstr "ist interessiert an:"
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1229
+#: ../../include/contact_widgets.php:9 ../../boot.php:1264
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -1428,7 +1459,7 @@ msgid "Remote privacy information not available."
 msgstr "Entfernte Privatsphäreneinstellungen nicht verfügbar."
 
 #: ../../mod/lockview.php:48
-#: ../../addon/remote_permissions/remote_permissions.php:123
+#: ../../addon/remote_permissions/remote_permissions.php:124
 msgid "Visible to:"
 msgstr "Sichtbar für:"
 
@@ -1444,135 +1475,135 @@ msgstr "Gruppe ist leer"
 msgid "Group: "
 msgstr "Gruppe: "
 
-#: ../../mod/content.php:438 ../../mod/content.php:723
+#: ../../mod/content.php:438 ../../mod/content.php:740
 #: ../../include/conversation.php:568 ../../object/Item.php:118
 msgid "Select"
 msgstr "Auswählen"
 
-#: ../../mod/content.php:455 ../../mod/content.php:817
-#: ../../mod/content.php:818 ../../include/conversation.php:587
-#: ../../object/Item.php:235 ../../object/Item.php:236
+#: ../../mod/content.php:472 ../../mod/content.php:852
+#: ../../mod/content.php:853 ../../include/conversation.php:608
+#: ../../object/Item.php:257 ../../object/Item.php:258
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Das Profil von %s auf %s betrachten."
 
-#: ../../mod/content.php:465 ../../mod/content.php:829
-#: ../../include/conversation.php:607 ../../object/Item.php:249
+#: ../../mod/content.php:482 ../../mod/content.php:864
+#: ../../include/conversation.php:628 ../../object/Item.php:271
 #, php-format
 msgid "%s from %s"
 msgstr "%s von %s"
 
-#: ../../mod/content.php:480 ../../include/conversation.php:622
+#: ../../mod/content.php:497 ../../include/conversation.php:643
 msgid "View in context"
 msgstr "Im Zusammenhang betrachten"
 
-#: ../../mod/content.php:586 ../../object/Item.php:289
+#: ../../mod/content.php:603 ../../object/Item.php:312
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d Kommentar"
 msgstr[1] "%d Kommentare"
 
-#: ../../mod/content.php:588 ../../include/text.php:1446
-#: ../../object/Item.php:291 ../../object/Item.php:304
+#: ../../mod/content.php:605 ../../include/text.php:1503
+#: ../../object/Item.php:314 ../../object/Item.php:327
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] ""
 msgstr[1] "Kommentar"
 
-#: ../../mod/content.php:589 ../../addon/page/page.php:77
+#: ../../mod/content.php:606 ../../addon/page/page.php:77
 #: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119
-#: ../../include/contact_widgets.php:204 ../../boot.php:622
-#: ../../object/Item.php:292 ../../addon.old/page/page.php:77
+#: ../../include/contact_widgets.php:204 ../../boot.php:636
+#: ../../object/Item.php:315 ../../addon.old/page/page.php:77
 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119
 msgid "show more"
 msgstr "mehr anzeigen"
 
-#: ../../mod/content.php:667 ../../object/Item.php:203
+#: ../../mod/content.php:684 ../../object/Item.php:203
 msgid "like"
 msgstr "mag ich"
 
-#: ../../mod/content.php:668 ../../object/Item.php:204
+#: ../../mod/content.php:685 ../../object/Item.php:204
 msgid "dislike"
 msgstr "mag ich nicht"
 
-#: ../../mod/content.php:670 ../../object/Item.php:206
+#: ../../mod/content.php:687 ../../object/Item.php:206
 msgid "Share this"
 msgstr "Weitersagen"
 
-#: ../../mod/content.php:670 ../../object/Item.php:206
+#: ../../mod/content.php:687 ../../object/Item.php:206
 msgid "share"
 msgstr "Teilen"
 
-#: ../../mod/content.php:694 ../../object/Item.php:578
+#: ../../mod/content.php:711 ../../object/Item.php:610
 msgid "Bold"
 msgstr "Fett"
 
-#: ../../mod/content.php:695 ../../object/Item.php:579
+#: ../../mod/content.php:712 ../../object/Item.php:611
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../../mod/content.php:696 ../../object/Item.php:580
+#: ../../mod/content.php:713 ../../object/Item.php:612
 msgid "Underline"
 msgstr "Unterstrichen"
 
-#: ../../mod/content.php:697 ../../object/Item.php:581
+#: ../../mod/content.php:714 ../../object/Item.php:613
 msgid "Quote"
 msgstr "Zitat"
 
-#: ../../mod/content.php:698 ../../object/Item.php:582
+#: ../../mod/content.php:715 ../../object/Item.php:614
 msgid "Code"
 msgstr "Code"
 
-#: ../../mod/content.php:699 ../../object/Item.php:583
+#: ../../mod/content.php:716 ../../object/Item.php:615
 msgid "Image"
 msgstr "Bild"
 
-#: ../../mod/content.php:700 ../../object/Item.php:584
+#: ../../mod/content.php:717 ../../object/Item.php:616
 msgid "Link"
 msgstr "Verweis"
 
-#: ../../mod/content.php:701 ../../object/Item.php:585
+#: ../../mod/content.php:718 ../../object/Item.php:617
 msgid "Video"
 msgstr "Video"
 
-#: ../../mod/content.php:736 ../../object/Item.php:182
+#: ../../mod/content.php:753 ../../object/Item.php:182
 msgid "add star"
 msgstr "markieren"
 
-#: ../../mod/content.php:737 ../../object/Item.php:183
+#: ../../mod/content.php:754 ../../object/Item.php:183
 msgid "remove star"
 msgstr "Markierung entfernen"
 
-#: ../../mod/content.php:738 ../../object/Item.php:184
+#: ../../mod/content.php:755 ../../object/Item.php:184
 msgid "toggle star status"
 msgstr "Markierung umschalten"
 
-#: ../../mod/content.php:741 ../../object/Item.php:187
+#: ../../mod/content.php:758 ../../object/Item.php:187
 msgid "starred"
 msgstr "markiert"
 
-#: ../../mod/content.php:742 ../../object/Item.php:192
+#: ../../mod/content.php:759 ../../object/Item.php:192
 msgid "add tag"
 msgstr "Tag hinzufügen"
 
-#: ../../mod/content.php:746 ../../object/Item.php:122
+#: ../../mod/content.php:763 ../../object/Item.php:122
 msgid "save to folder"
 msgstr "In Ordner speichern"
 
-#: ../../mod/content.php:819 ../../object/Item.php:237
+#: ../../mod/content.php:854 ../../object/Item.php:259
 msgid "to"
 msgstr "zu"
 
-#: ../../mod/content.php:820 ../../object/Item.php:239
+#: ../../mod/content.php:855 ../../object/Item.php:261
 msgid "Wall-to-Wall"
 msgstr "Wall-to-Wall"
 
-#: ../../mod/content.php:821 ../../object/Item.php:240
+#: ../../mod/content.php:856 ../../object/Item.php:262
 msgid "via Wall-To-Wall:"
 msgstr "via Wall-To-Wall:"
 
-#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:180
+#: ../../mod/home.php:34 ../../addon/communityhome/communityhome.php:189
 #: ../../addon.old/communityhome/communityhome.php:179
 #, php-format
 msgid "Welcome to %s"
@@ -1582,13 +1613,13 @@ msgstr "Willkommen zu %s"
 msgid "Invalid request identifier."
 msgstr "Invalid request identifier."
 
-#: ../../mod/notifications.php:35 ../../mod/notifications.php:164
-#: ../../mod/notifications.php:210
+#: ../../mod/notifications.php:35 ../../mod/notifications.php:165
+#: ../../mod/notifications.php:211
 msgid "Discard"
 msgstr "Verwerfen"
 
-#: ../../mod/notifications.php:51 ../../mod/notifications.php:163
-#: ../../mod/notifications.php:209 ../../mod/contacts.php:325
+#: ../../mod/notifications.php:51 ../../mod/notifications.php:164
+#: ../../mod/notifications.php:210 ../../mod/contacts.php:325
 #: ../../mod/contacts.php:379
 msgid "Ignore"
 msgstr "Ignorieren"
@@ -1627,139 +1658,139 @@ msgstr "Zeige ignorierte Anfragen"
 msgid "Hide Ignored Requests"
 msgstr "Verberge ignorierte Anfragen"
 
-#: ../../mod/notifications.php:148 ../../mod/notifications.php:194
+#: ../../mod/notifications.php:149 ../../mod/notifications.php:195
 msgid "Notification type: "
 msgstr "Benachrichtigungstyp: "
 
-#: ../../mod/notifications.php:149
+#: ../../mod/notifications.php:150
 msgid "Friend Suggestion"
 msgstr "Kontaktvorschlag"
 
-#: ../../mod/notifications.php:151
+#: ../../mod/notifications.php:152
 #, php-format
 msgid "suggested by %s"
 msgstr "vorgeschlagen von %s"
 
-#: ../../mod/notifications.php:156 ../../mod/notifications.php:203
+#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
 #: ../../mod/contacts.php:385
 msgid "Hide this contact from others"
 msgstr "Verberge diesen Kontakt vor anderen"
 
-#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
+#: ../../mod/notifications.php:158 ../../mod/notifications.php:205
 msgid "Post a new friend activity"
 msgstr "Neue-Kontakt Nachricht senden"
 
-#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
+#: ../../mod/notifications.php:158 ../../mod/notifications.php:205
 msgid "if applicable"
 msgstr "falls anwendbar"
 
-#: ../../mod/notifications.php:160 ../../mod/notifications.php:207
-#: ../../mod/admin.php:697
+#: ../../mod/notifications.php:161 ../../mod/notifications.php:208
+#: ../../mod/admin.php:733
 msgid "Approve"
 msgstr "Genehmigen"
 
-#: ../../mod/notifications.php:180
+#: ../../mod/notifications.php:181
 msgid "Claims to be known to you: "
 msgstr "Behauptet dich zu kennen: "
 
-#: ../../mod/notifications.php:180
+#: ../../mod/notifications.php:181
 msgid "yes"
 msgstr "ja"
 
-#: ../../mod/notifications.php:180
+#: ../../mod/notifications.php:181
 msgid "no"
 msgstr "nein"
 
-#: ../../mod/notifications.php:187
+#: ../../mod/notifications.php:188
 msgid "Approve as: "
 msgstr "Genehmigen als: "
 
-#: ../../mod/notifications.php:188
+#: ../../mod/notifications.php:189
 msgid "Friend"
 msgstr "Freund"
 
-#: ../../mod/notifications.php:189
+#: ../../mod/notifications.php:190
 msgid "Sharer"
 msgstr "Teilenden"
 
-#: ../../mod/notifications.php:189
+#: ../../mod/notifications.php:190
 msgid "Fan/Admirer"
 msgstr "Fan/Verehrer"
 
-#: ../../mod/notifications.php:195
+#: ../../mod/notifications.php:196
 msgid "Friend/Connect Request"
 msgstr "Kontakt-/Freundschaftsanfrage"
 
-#: ../../mod/notifications.php:195
+#: ../../mod/notifications.php:196
 msgid "New Follower"
 msgstr "Neuer Bewunderer"
 
-#: ../../mod/notifications.php:216
+#: ../../mod/notifications.php:217
 msgid "No introductions."
 msgstr "Keine Kontaktanfragen."
 
-#: ../../mod/notifications.php:219 ../../include/nav.php:123
+#: ../../mod/notifications.php:220 ../../include/nav.php:123
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: ../../mod/notifications.php:256 ../../mod/notifications.php:381
-#: ../../mod/notifications.php:468
+#: ../../mod/notifications.php:257 ../../mod/notifications.php:382
+#: ../../mod/notifications.php:469
 #, php-format
 msgid "%s liked %s's post"
 msgstr "%s mag %ss Beitrag"
 
-#: ../../mod/notifications.php:265 ../../mod/notifications.php:390
-#: ../../mod/notifications.php:477
+#: ../../mod/notifications.php:266 ../../mod/notifications.php:391
+#: ../../mod/notifications.php:478
 #, php-format
 msgid "%s disliked %s's post"
 msgstr "%s mag %ss Beitrag nicht"
 
-#: ../../mod/notifications.php:279 ../../mod/notifications.php:404
-#: ../../mod/notifications.php:491
+#: ../../mod/notifications.php:280 ../../mod/notifications.php:405
+#: ../../mod/notifications.php:492
 #, php-format
 msgid "%s is now friends with %s"
 msgstr "%s ist jetzt mit %s befreundet"
 
-#: ../../mod/notifications.php:286 ../../mod/notifications.php:411
+#: ../../mod/notifications.php:287 ../../mod/notifications.php:412
 #, php-format
 msgid "%s created a new post"
 msgstr "%s hat einen neuen Beitrag erstellt"
 
-#: ../../mod/notifications.php:287 ../../mod/notifications.php:412
-#: ../../mod/notifications.php:500
+#: ../../mod/notifications.php:288 ../../mod/notifications.php:413
+#: ../../mod/notifications.php:501
 #, php-format
 msgid "%s commented on %s's post"
 msgstr "%s hat %ss Beitrag kommentiert"
 
-#: ../../mod/notifications.php:301
+#: ../../mod/notifications.php:302
 msgid "No more network notifications."
 msgstr "Keine weiteren Netzwerk-Benachrichtigungen."
 
-#: ../../mod/notifications.php:305
+#: ../../mod/notifications.php:306
 msgid "Network Notifications"
 msgstr "Netzwerk Benachrichtigungen"
 
-#: ../../mod/notifications.php:331 ../../mod/notify.php:61
+#: ../../mod/notifications.php:332 ../../mod/notify.php:61
 msgid "No more system notifications."
 msgstr "Keine weiteren Systembenachrichtigungen."
 
-#: ../../mod/notifications.php:335 ../../mod/notify.php:65
+#: ../../mod/notifications.php:336 ../../mod/notify.php:65
 msgid "System Notifications"
 msgstr "Systembenachrichtigungen"
 
-#: ../../mod/notifications.php:426
+#: ../../mod/notifications.php:427
 msgid "No more personal notifications."
 msgstr "Keine weiteren persönlichen Benachrichtigungen"
 
-#: ../../mod/notifications.php:430
+#: ../../mod/notifications.php:431
 msgid "Personal Notifications"
 msgstr "Persönliche Benachrichtigungen"
 
-#: ../../mod/notifications.php:507
+#: ../../mod/notifications.php:508
 msgid "No more home notifications."
 msgstr "Keine weiteren Pinnwand-Benachrichtigungen"
 
-#: ../../mod/notifications.php:511
+#: ../../mod/notifications.php:512
 msgid "Home Notifications"
 msgstr "Pinnwand Benachrichtigungen"
 
@@ -1855,12 +1886,12 @@ msgid "View all contacts"
 msgstr "Alle Kontakte anzeigen"
 
 #: ../../mod/contacts.php:319 ../../mod/contacts.php:378
-#: ../../mod/admin.php:701
+#: ../../mod/admin.php:737
 msgid "Unblock"
 msgstr "Entsperren"
 
 #: ../../mod/contacts.php:319 ../../mod/contacts.php:378
-#: ../../mod/admin.php:700
+#: ../../mod/admin.php:736
 msgid "Block"
 msgstr "Sperren"
 
@@ -1957,7 +1988,7 @@ msgstr "letzte Aktualisierung:"
 msgid "Update public posts"
 msgstr "Öffentliche Beiträge aktualisieren"
 
-#: ../../mod/contacts.php:375 ../../mod/admin.php:1173
+#: ../../mod/contacts.php:375 ../../mod/admin.php:1209
 msgid "Update now"
 msgstr "Jetzt aktualisieren"
 
@@ -1986,7 +2017,7 @@ msgstr "Kontaktvorschläge"
 msgid "Suggest potential friends"
 msgstr "Freunde vorschlagen"
 
-#: ../../mod/contacts.php:444 ../../mod/group.php:191
+#: ../../mod/contacts.php:444 ../../mod/group.php:194
 msgid "All Contacts"
 msgstr "Alle Kontakte"
 
@@ -2070,81 +2101,71 @@ msgstr "Funde: "
 msgid "Find"
 msgstr "Finde"
 
-#: ../../mod/lostpass.php:16
+#: ../../mod/lostpass.php:17
 msgid "No valid account found."
 msgstr "Kein gültiges Konto gefunden."
 
-#: ../../mod/lostpass.php:32
+#: ../../mod/lostpass.php:33
 msgid "Password reset request issued. Check your email."
 msgstr "Zurücksetzen des Passworts eingeleitet. Bitte überprüfe deine E-Mail."
 
-#: ../../mod/lostpass.php:43
+#: ../../mod/lostpass.php:49
 #, php-format
 msgid "Password reset requested at %s"
 msgstr "Anfrage zum Zurücksetzen des Passworts auf %s erhalten"
 
-#: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
-#: ../../mod/register.php:91 ../../mod/register.php:145
-#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752
-#: ../../addon/facebook/facebook.php:702
-#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:777
-#: ../../addon/public_server/public_server.php:62
-#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3365
-#: ../../boot.php:837 ../../addon.old/facebook/facebook.php:702
-#: ../../addon.old/facebook/facebook.php:1200
-#: ../../addon.old/fbpost/fbpost.php:661
-#: ../../addon.old/public_server/public_server.php:62
-#: ../../addon.old/testdrive/testdrive.php:67
-msgid "Administrator"
-msgstr "Administrator"
-
-#: ../../mod/lostpass.php:65
+#: ../../mod/lostpass.php:71
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
 msgstr "Anfrage konnte nicht verifiziert werden. (Eventuell hast du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert."
 
-#: ../../mod/lostpass.php:83 ../../boot.php:976
+#: ../../mod/lostpass.php:89 ../../boot.php:998
 msgid "Password Reset"
 msgstr "Passwort zurücksetzen"
 
-#: ../../mod/lostpass.php:84
+#: ../../mod/lostpass.php:90
 msgid "Your password has been reset as requested."
 msgstr "Dein Passwort wurde wie gewünscht zurückgesetzt."
 
-#: ../../mod/lostpass.php:85
+#: ../../mod/lostpass.php:91
 msgid "Your new password is"
 msgstr "Dein neues Passwort lautet"
 
-#: ../../mod/lostpass.php:86
+#: ../../mod/lostpass.php:92
 msgid "Save or copy your new password - and then"
 msgstr "Speichere oder kopiere dein neues Passwort - und dann"
 
-#: ../../mod/lostpass.php:87
+#: ../../mod/lostpass.php:93
 msgid "click here to login"
 msgstr "hier klicken, um dich anzumelden"
 
-#: ../../mod/lostpass.php:88
+#: ../../mod/lostpass.php:94
 msgid ""
 "Your password may be changed from the <em>Settings</em> page after "
 "successful login."
 msgstr "Du kannst das Passwort in den <em>Einstellungen</em> ändern, sobald du dich erfolgreich angemeldet hast."
 
-#: ../../mod/lostpass.php:119
+#: ../../mod/lostpass.php:116
+#, php-format
+msgid "Your password has been changed at %s"
+msgstr "Auf %s wurde dein Passwort geändert"
+
+#: ../../mod/lostpass.php:131
 msgid "Forgot your Password?"
 msgstr "Hast du dein Passwort vergessen?"
 
-#: ../../mod/lostpass.php:120
+#: ../../mod/lostpass.php:132
 msgid ""
 "Enter your email address and submit to have your password reset. Then check "
 "your email for further instructions."
 msgstr "Gib deine E-Mail-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesendet."
 
-#: ../../mod/lostpass.php:121
+#: ../../mod/lostpass.php:133
 msgid "Nickname or Email: "
 msgstr "Spitzname oder E-Mail:"
 
-#: ../../mod/lostpass.php:122
+#: ../../mod/lostpass.php:134
 msgid "Reset"
 msgstr "Zurücksetzen"
 
@@ -2212,13 +2233,13 @@ msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt. Die vorein
 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt, und es gibt keine voreingestellte Gruppe für neue Kontakte."
 
-#: ../../mod/settings.php:488 ../../addon/facebook/facebook.php:495
-#: ../../addon/fbpost/fbpost.php:151
-#: ../../addon/remote_permissions/remote_permissions.php:204
+#: ../../mod/settings.php:488 ../../addon/facebook/facebook.php:497
+#: ../../addon/fbpost/fbpost.php:155
+#: ../../addon/remote_permissions/remote_permissions.php:205
 #: ../../addon/impressum/impressum.php:78
 #: ../../addon/openstreetmap/openstreetmap.php:80
 #: ../../addon/altpager/altpager.php:107 ../../addon/mathjax/mathjax.php:66
-#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:501
+#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:548
 #: ../../addon.old/facebook/facebook.php:495
 #: ../../addon.old/fbpost/fbpost.php:144
 #: ../../addon.old/impressum/impressum.php:78
@@ -2234,13 +2255,13 @@ msgid "Add application"
 msgstr "Programm hinzufügen"
 
 #: ../../mod/settings.php:563 ../../mod/settings.php:589
-#: ../../addon/statusnet/statusnet.php:694
+#: ../../addon/statusnet/statusnet.php:747
 #: ../../addon.old/statusnet/statusnet.php:570
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
 #: ../../mod/settings.php:564 ../../mod/settings.php:590
-#: ../../addon/statusnet/statusnet.php:693
+#: ../../addon/statusnet/statusnet.php:746
 #: ../../addon.old/statusnet/statusnet.php:569
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
@@ -2277,7 +2298,7 @@ msgstr "Autorisierung entziehen"
 msgid "No Plugin settings configured"
 msgstr "Keine Plugin-Einstellungen konfiguriert"
 
-#: ../../mod/settings.php:646 ../../addon/widgets/widgets.php:123
+#: ../../mod/settings.php:646 ../../addon/widgets/widgets.php:124
 #: ../../addon.old/widgets/widgets.php:123
 msgid "Plugin Settings"
 msgstr "Plugin-Einstellungen"
@@ -2294,24 +2315,24 @@ msgstr "An"
 msgid "Additional Features"
 msgstr "Zusätzliche Features"
 
-#: ../../mod/settings.php:682 ../../mod/settings.php:683
+#: ../../mod/settings.php:681 ../../mod/settings.php:682
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr "Eingebaute Unterstützung für Verbindungen zu %s ist %s"
 
-#: ../../mod/settings.php:682 ../../mod/settings.php:683
+#: ../../mod/settings.php:681 ../../mod/settings.php:682
 msgid "enabled"
 msgstr "eingeschaltet"
 
-#: ../../mod/settings.php:682 ../../mod/settings.php:683
+#: ../../mod/settings.php:681 ../../mod/settings.php:682
 msgid "disabled"
 msgstr "ausgeschaltet"
 
-#: ../../mod/settings.php:683
+#: ../../mod/settings.php:682
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: ../../mod/settings.php:715
+#: ../../mod/settings.php:714
 msgid "Email access is disabled on this site."
 msgstr "Zugriff auf E-Mails für diese Seite deaktiviert."
 
@@ -2346,7 +2367,7 @@ msgid "Security:"
 msgstr "Sicherheit:"
 
 #: ../../mod/settings.php:732 ../../mod/settings.php:737
-#: ../../addon/fbpost/fbpost.php:247 ../../addon/fbpost/fbpost.php:249
+#: ../../addon/fbpost/fbpost.php:255 ../../addon/fbpost/fbpost.php:257
 #: ../../addon/dav/common/wdcal_edit.inc.php:191
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:191
 msgid "None"
@@ -2384,7 +2405,7 @@ msgstr "In einen Ordner verschieben"
 msgid "Move to folder:"
 msgstr "In diesen Ordner verschieben:"
 
-#: ../../mod/settings.php:769 ../../mod/admin.php:404
+#: ../../mod/settings.php:769 ../../mod/admin.php:420
 msgid "No special theme for mobile devices"
 msgstr "Kein spezielles Theme für mobile Geräte verwenden."
 
@@ -2780,16 +2801,16 @@ msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gela
 msgid "Invalid contact."
 msgstr "Ungültiger Kontakt."
 
-#: ../../mod/notes.php:44 ../../boot.php:1768
+#: ../../mod/notes.php:44 ../../boot.php:1812
 msgid "Personal Notes"
 msgstr "Persönliche Notizen"
 
-#: ../../mod/notes.php:63 ../../mod/filer.php:30
-#: ../../addon/facebook/facebook.php:770
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:281
-#: ../../addon/fbpost/fbpost.php:314
+#: ../../mod/notes.php:63 ../../mod/filer.php:31
+#: ../../addon/facebook/facebook.php:772
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:354
+#: ../../addon/fbpost/fbpost.php:322
 #: ../../addon/dav/friendica/layout.fnk.php:441
-#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:688
+#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:742
 #: ../../addon.old/facebook/facebook.php:770
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:263
 #: ../../addon.old/fbpost/fbpost.php:267
@@ -2798,7 +2819,7 @@ msgstr "Persönliche Notizen"
 msgid "Save"
 msgstr "Speichern"
 
-#: ../../mod/uimport.php:50 ../../mod/register.php:190
+#: ../../mod/uimport.php:50 ../../mod/register.php:207
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
@@ -2813,11 +2834,21 @@ msgid "Move account"
 msgstr "Account umziehen"
 
 #: ../../mod/uimport.php:67
+msgid "You can import an account from another Friendica server."
+msgstr "Du kannst einen Account von einem anderen Friendica Server importieren."
+
+#: ../../mod/uimport.php:68
 msgid ""
-"You can import an account from another Friendica server. <br>\r\n"
-"                            You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here.<br>\r\n"
-"                            <b>This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from diaspora"
-msgstr "Du kannst deinen Account auf einen anderen Friendica Server umziehen.<br>Dazu musst du deinen Account von deinem alten Server exportieren und hier hochladen. Wir werden dann deinen alten Account, mit allen Kontakten, hier wieder herstellen. Außerdem werden wir deine Kontakte darüber informieren, dass du hierher umgezogen bist.<br><b>Dieses Feature ist experimentell. Kontakte aus dem OStatus Netzwerk (StatusNet/identi.ca) oder von Diaspora können nicht mit umgezogen werden.</b>"
+"You need to export your account from the old server and upload it here. We "
+"will recreate your old account here with all your contacts. We will try also"
+" to inform your friends that you moved here."
+msgstr "Du musst deinen Account vom alten Server exportieren und hier hochladen. Wir stellen deinen alten Account mit all deinen Kontakten wieder her. Wir werden auch versuchen all deine Freunde darüber zu informieren, dass du hierher umgezogen bist."
+
+#: ../../mod/uimport.php:69
+msgid ""
+"This feature is experimental. We can't import contacts from the OStatus "
+"network (statusnet/identi.ca) or from Diaspora"
+msgstr "Dieses Feature ist experimentell. Wir können keine Kontakte vom OStatus Netzwerk (statusnet/identi.ca) oder von Diaspora importieren"
 
 #: ../../mod/uimport.php:70
 msgid "Account file"
@@ -2860,7 +2891,8 @@ msgstr "Kein Empfänger."
 
 #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
 #: ../../mod/message.php:249 ../../mod/message.php:257
-#: ../../include/conversation.php:905 ../../include/conversation.php:923
+#: ../../mod/message.php:429 ../../mod/message.php:437
+#: ../../include/conversation.php:941 ../../include/conversation.php:959
 msgid "Please enter a link URL:"
 msgstr "Bitte gib die URL des Links ein:"
 
@@ -2876,17 +2908,17 @@ msgid ""
 msgstr "Wenn du möchtest, dass %s dir antworten kann, überprüfe deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern."
 
 #: ../../mod/wallmessage.php:140 ../../mod/message.php:286
-#: ../../mod/message.php:476
+#: ../../mod/message.php:516
 msgid "To:"
 msgstr "An:"
 
 #: ../../mod/wallmessage.php:141 ../../mod/message.php:291
-#: ../../mod/message.php:478
+#: ../../mod/message.php:518
 msgid "Subject:"
 msgstr "Betreff:"
 
 #: ../../mod/wallmessage.php:147 ../../mod/message.php:295
-#: ../../mod/message.php:481 ../../mod/invite.php:113
+#: ../../mod/message.php:521 ../../mod/invite.php:115
 msgid "Your message:"
 msgstr "Deine Nachricht:"
 
@@ -2943,7 +2975,7 @@ msgstr "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen
 #: ../../mod/newmember.php:32 ../../mod/profperm.php:103
 #: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7
 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50
-#: ../../boot.php:1744
+#: ../../boot.php:1788
 msgid "Profile"
 msgstr "Profil"
 
@@ -2985,7 +3017,7 @@ msgid "Connecting"
 msgstr "Verbindungen knüpfen"
 
 #: ../../mod/newmember.php:49 ../../mod/newmember.php:51
-#: ../../addon/facebook/facebook.php:728 ../../addon/fbpost/fbpost.php:286
+#: ../../addon/facebook/facebook.php:730 ../../addon/fbpost/fbpost.php:294
 #: ../../include/contact_selectors.php:81
 #: ../../addon.old/facebook/facebook.php:728
 #: ../../addon.old/fbpost/fbpost.php:239
@@ -3106,7 +3138,7 @@ msgstr "Gruppe erstellt."
 msgid "Could not create group."
 msgstr "Konnte die Gruppe nicht erstellen."
 
-#: ../../mod/group.php:47 ../../mod/group.php:137
+#: ../../mod/group.php:47 ../../mod/group.php:140
 msgid "Group not found."
 msgstr "Gruppe nicht gefunden."
 
@@ -3118,31 +3150,31 @@ msgstr "Gruppenname geändert."
 msgid "Permission denied"
 msgstr "Zugriff verweigert"
 
-#: ../../mod/group.php:90
+#: ../../mod/group.php:93
 msgid "Create a group of contacts/friends."
 msgstr "Eine Gruppe von Kontakten/Freunden anlegen."
 
-#: ../../mod/group.php:91 ../../mod/group.php:177
+#: ../../mod/group.php:94 ../../mod/group.php:180
 msgid "Group Name: "
 msgstr "Gruppenname:"
 
-#: ../../mod/group.php:110
+#: ../../mod/group.php:113
 msgid "Group removed."
 msgstr "Gruppe entfernt."
 
-#: ../../mod/group.php:112
+#: ../../mod/group.php:115
 msgid "Unable to remove group."
 msgstr "Konnte die Gruppe nicht entfernen."
 
-#: ../../mod/group.php:176
+#: ../../mod/group.php:179
 msgid "Group Editor"
 msgstr "Gruppeneditor"
 
-#: ../../mod/group.php:189
+#: ../../mod/group.php:192
 msgid "Members"
 msgstr "Mitglieder"
 
-#: ../../mod/group.php:221 ../../mod/profperm.php:105
+#: ../../mod/group.php:223 ../../mod/profperm.php:105
 msgid "Click on a contact to add or remove."
 msgstr "Klicke einen Kontakt an, um ihn hinzuzufügen oder zu entfernen"
 
@@ -3166,89 +3198,89 @@ msgstr "Alle Kontakte (mit gesichertem Profilzugriff)"
 msgid "No contacts."
 msgstr "Keine Kontakte."
 
-#: ../../mod/viewcontacts.php:76 ../../include/text.php:625
+#: ../../mod/viewcontacts.php:76 ../../include/text.php:679
 msgid "View Contacts"
 msgstr "Kontakte anzeigen"
 
-#: ../../mod/register.php:89 ../../mod/regmod.php:52
+#: ../../mod/register.php:99 ../../mod/regmod.php:61
 #, php-format
 msgid "Registration details for %s"
 msgstr "Details der Registration von %s"
 
-#: ../../mod/register.php:97
+#: ../../mod/register.php:107
 msgid ""
 "Registration successful. Please check your email for further instructions."
 msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an dich gesendet."
 
-#: ../../mod/register.php:101
+#: ../../mod/register.php:111
 msgid "Failed to send email message. Here is the message that failed."
 msgstr "Konnte die E-Mail nicht versenden. Hier ist die Nachricht, die nicht gesendet werden konnte."
 
-#: ../../mod/register.php:106
+#: ../../mod/register.php:116
 msgid "Your registration can not be processed."
 msgstr "Deine Registrierung konnte nicht verarbeitet werden."
 
-#: ../../mod/register.php:143
+#: ../../mod/register.php:160
 #, php-format
 msgid "Registration request at %s"
 msgstr "Registrierungsanfrage auf %s"
 
-#: ../../mod/register.php:152
+#: ../../mod/register.php:169
 msgid "Your registration is pending approval by the site owner."
 msgstr "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden."
 
-#: ../../mod/register.php:218
+#: ../../mod/register.php:235
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr "Du kannst dieses Formular auch (optional) mit deiner OpenID ausfüllen, indem du deine OpenID angibst und 'Registrieren' klickst."
 
-#: ../../mod/register.php:219
+#: ../../mod/register.php:236
 msgid ""
 "If you are not familiar with OpenID, please leave that field blank and fill "
 "in the rest of the items."
 msgstr "Wenn du nicht mit OpenID vertraut bist, lass dieses Feld bitte leer und fülle die restlichen Felder aus."
 
-#: ../../mod/register.php:220
+#: ../../mod/register.php:237
 msgid "Your OpenID (optional): "
 msgstr "Deine OpenID (optional): "
 
-#: ../../mod/register.php:234
+#: ../../mod/register.php:251
 msgid "Include your profile in member directory?"
 msgstr "Soll dein Profil im Nutzerverzeichnis angezeigt werden?"
 
-#: ../../mod/register.php:256
+#: ../../mod/register.php:272
 msgid "Membership on this site is by invitation only."
 msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich."
 
-#: ../../mod/register.php:257
+#: ../../mod/register.php:273
 msgid "Your invitation ID: "
 msgstr "ID deiner Einladung: "
 
-#: ../../mod/register.php:260 ../../mod/admin.php:446
+#: ../../mod/register.php:276 ../../mod/admin.php:462
 msgid "Registration"
 msgstr "Registrierung"
 
-#: ../../mod/register.php:268
+#: ../../mod/register.php:284
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr "Vollständiger Name (z.B. Max Mustermann): "
 
-#: ../../mod/register.php:269
+#: ../../mod/register.php:285
 msgid "Your Email Address: "
 msgstr "Deine E-Mail-Adresse: "
 
-#: ../../mod/register.php:270
+#: ../../mod/register.php:286
 msgid ""
 "Choose a profile nickname. This must begin with a text character. Your "
 "profile address on this site will then be "
 "'<strong>nickname@$sitename</strong>'."
 msgstr "Wähle einen Spitznamen für dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse deines Profils auf dieser Seite wird '<strong>spitzname@$sitename</strong>' sein."
 
-#: ../../mod/register.php:271
+#: ../../mod/register.php:287
 msgid "Choose a nickname: "
 msgstr "Spitznamen wählen: "
 
-#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:936
+#: ../../mod/register.php:290 ../../include/nav.php:81 ../../boot.php:959
 msgid "Register"
 msgstr "Registrieren"
 
@@ -3257,20 +3289,20 @@ msgid "People Search"
 msgstr "Personensuche"
 
 #: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62
-#: ../../addon/communityhome/communityhome.php:164
-#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1442
-#: ../../include/diaspora.php:1848 ../../include/conversation.php:125
+#: ../../addon/communityhome/communityhome.php:171
+#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1499
+#: ../../include/diaspora.php:1851 ../../include/conversation.php:125
 #: ../../include/conversation.php:253
 #: ../../addon.old/communityhome/communityhome.php:163
 msgid "photo"
 msgstr "Foto"
 
 #: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/subthread.php:87
-#: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598
-#: ../../addon/communityhome/communityhome.php:159
-#: ../../addon/communityhome/communityhome.php:168
+#: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1600
+#: ../../addon/communityhome/communityhome.php:166
+#: ../../addon/communityhome/communityhome.php:175
 #: ../../view/theme/diabook/theme.php:459
-#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1848
+#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1851
 #: ../../include/conversation.php:120 ../../include/conversation.php:129
 #: ../../include/conversation.php:248 ../../include/conversation.php:257
 #: ../../addon.old/facebook/facebook.php:1598
@@ -3279,9 +3311,9 @@ msgstr "Foto"
 msgid "status"
 msgstr "Status"
 
-#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602
-#: ../../addon/communityhome/communityhome.php:173
-#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1864
+#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1604
+#: ../../addon/communityhome/communityhome.php:180
+#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1867
 #: ../../include/conversation.php:136
 #: ../../addon.old/facebook/facebook.php:1602
 #: ../../addon.old/communityhome/communityhome.php:172
@@ -3295,8 +3327,8 @@ msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s mag %2$ss %3$s nicht"
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
-#: ../../mod/admin.php:737 ../../mod/admin.php:936 ../../mod/display.php:39
-#: ../../mod/display.php:169 ../../include/items.php:3843
+#: ../../mod/admin.php:773 ../../mod/admin.php:972 ../../mod/display.php:47
+#: ../../mod/display.php:177 ../../include/items.php:3860
 msgid "Item not found."
 msgstr "Beitrag nicht gefunden."
 
@@ -3305,24 +3337,24 @@ msgid "Access denied."
 msgstr "Zugriff verweigert."
 
 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90
-#: ../../include/nav.php:51 ../../boot.php:1751
+#: ../../include/nav.php:51 ../../boot.php:1795
 msgid "Photos"
 msgstr "Bilder"
 
-#: ../../mod/fbrowser.php:96
+#: ../../mod/fbrowser.php:113
 msgid "Files"
 msgstr "Dateien"
 
-#: ../../mod/regmod.php:61
+#: ../../mod/regmod.php:70
 msgid "Account approved."
 msgstr "Konto freigegeben."
 
-#: ../../mod/regmod.php:98
+#: ../../mod/regmod.php:107
 #, php-format
 msgid "Registration revoked for %s"
 msgstr "Registrierung für %s wurde zurückgezogen"
 
-#: ../../mod/regmod.php:110
+#: ../../mod/regmod.php:119
 msgid "Please login."
 msgstr "Bitte melde dich an."
 
@@ -3496,36 +3528,36 @@ msgstr "Du und %s"
 msgid "%s and You"
 msgstr "%s und du"
 
-#: ../../mod/message.php:357 ../../mod/message.php:469
+#: ../../mod/message.php:368 ../../mod/message.php:509
 msgid "Delete conversation"
 msgstr "Unterhaltung löschen"
 
-#: ../../mod/message.php:360
+#: ../../mod/message.php:371
 msgid "D, d M Y - g:i A"
 msgstr "D, d. M Y - g:i A"
 
-#: ../../mod/message.php:363
+#: ../../mod/message.php:374
 #, php-format
 msgid "%d message"
 msgid_plural "%d messages"
 msgstr[0] "%d Nachricht"
 msgstr[1] "%d Nachrichten"
 
-#: ../../mod/message.php:398
+#: ../../mod/message.php:413
 msgid "Message not available."
 msgstr "Nachricht nicht verfügbar."
 
-#: ../../mod/message.php:451
+#: ../../mod/message.php:483
 msgid "Delete message"
 msgstr "Nachricht löschen"
 
-#: ../../mod/message.php:471
+#: ../../mod/message.php:511
 msgid ""
 "No secure communications available. You <strong>may</strong> be able to "
 "respond from the sender's profile page."
 msgstr "Sichere Kommunikation ist nicht verfügbar. <strong>Eventuell</strong> kannst du auf der Profilseite des Absenders antworten."
 
-#: ../../mod/message.php:475
+#: ../../mod/message.php:515
 msgid "Send Reply"
 msgstr "Antwort senden"
 
@@ -3542,19 +3574,19 @@ msgstr "Keine Freunde zum Anzeigen."
 msgid "Theme settings updated."
 msgstr "Themeneinstellungen aktualisiert."
 
-#: ../../mod/admin.php:96 ../../mod/admin.php:444
+#: ../../mod/admin.php:96 ../../mod/admin.php:460
 msgid "Site"
 msgstr "Seite"
 
-#: ../../mod/admin.php:97 ../../mod/admin.php:691 ../../mod/admin.php:704
+#: ../../mod/admin.php:97 ../../mod/admin.php:727 ../../mod/admin.php:740
 msgid "Users"
 msgstr "Nutzer"
 
-#: ../../mod/admin.php:98 ../../mod/admin.php:786 ../../mod/admin.php:828
+#: ../../mod/admin.php:98 ../../mod/admin.php:822 ../../mod/admin.php:864
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../../mod/admin.php:99 ../../mod/admin.php:991 ../../mod/admin.php:1027
+#: ../../mod/admin.php:99 ../../mod/admin.php:1027 ../../mod/admin.php:1063
 msgid "Themes"
 msgstr "Themen"
 
@@ -3562,7 +3594,7 @@ msgstr "Themen"
 msgid "DB updates"
 msgstr "DB Updates"
 
-#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1114
+#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1150
 msgid "Logs"
 msgstr "Protokolle"
 
@@ -3578,19 +3610,19 @@ msgstr "Plugin Features"
 msgid "User registrations waiting for confirmation"
 msgstr "Nutzeranmeldungen die auf Bestätigung warten"
 
-#: ../../mod/admin.php:183 ../../mod/admin.php:672
+#: ../../mod/admin.php:183 ../../mod/admin.php:698
 msgid "Normal Account"
 msgstr "Normales Konto"
 
-#: ../../mod/admin.php:184 ../../mod/admin.php:673
+#: ../../mod/admin.php:184 ../../mod/admin.php:699
 msgid "Soapbox Account"
 msgstr "Marktschreier-Konto"
 
-#: ../../mod/admin.php:185 ../../mod/admin.php:674
+#: ../../mod/admin.php:185 ../../mod/admin.php:700
 msgid "Community/Celebrity Account"
 msgstr "Forum/Promi-Konto"
 
-#: ../../mod/admin.php:186 ../../mod/admin.php:675
+#: ../../mod/admin.php:186 ../../mod/admin.php:701
 msgid "Automatic Friend Account"
 msgstr "Automatisches Freundekonto"
 
@@ -3606,9 +3638,9 @@ msgstr "Privates Forum"
 msgid "Message queues"
 msgstr "Nachrichten-Warteschlangen"
 
-#: ../../mod/admin.php:212 ../../mod/admin.php:443 ../../mod/admin.php:690
-#: ../../mod/admin.php:785 ../../mod/admin.php:827 ../../mod/admin.php:990
-#: ../../mod/admin.php:1026 ../../mod/admin.php:1113
+#: ../../mod/admin.php:212 ../../mod/admin.php:459 ../../mod/admin.php:726
+#: ../../mod/admin.php:821 ../../mod/admin.php:863 ../../mod/admin.php:1026
+#: ../../mod/admin.php:1062 ../../mod/admin.php:1149
 msgid "Administration"
 msgstr "Administration"
 
@@ -3632,574 +3664,622 @@ msgstr "Version"
 msgid "Active plugins"
 msgstr "Aktive Plugins"
 
-#: ../../mod/admin.php:375
+#: ../../mod/admin.php:391
 msgid "Site settings updated."
 msgstr "Seiteneinstellungen aktualisiert."
 
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:446
 msgid "Closed"
 msgstr "Geschlossen"
 
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:447
 msgid "Requires approval"
 msgstr "Bedarf der Zustimmung"
 
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:448
 msgid "Open"
 msgstr "Offen"
 
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:452
 msgid "No SSL policy, links will track page SSL state"
 msgstr "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten"
 
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:453
 msgid "Force all links to use SSL"
 msgstr "SSL für alle Links erzwingen"
 
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:454
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr "Selbst-unterzeichnetes Zertifikat, SSL nur für lokale Links verwenden (nicht empfohlen)"
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:463
 msgid "File upload"
 msgstr "Datei hochladen"
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:464
 msgid "Policies"
 msgstr "Regeln"
 
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:465
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: ../../mod/admin.php:453 ../../addon/statusnet/statusnet.php:691
+#: ../../mod/admin.php:466
+msgid "Performance"
+msgstr "Performance"
+
+#: ../../mod/admin.php:470 ../../addon/statusnet/statusnet.php:744
 #: ../../addon.old/statusnet/statusnet.php:567
 msgid "Site name"
 msgstr "Seitenname"
 
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:471
 msgid "Banner/Logo"
 msgstr "Banner/Logo"
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:472
 msgid "System language"
 msgstr "Systemsprache"
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:473
 msgid "System theme"
 msgstr "Systemweites Thema"
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:473
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr "Vorgabe für das System-Theme - kann von Benutzerprofilen überschrieben werden - <a href='#' id='cnftheme'>Theme-Einstellungen ändern</a>"
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:474
 msgid "Mobile system theme"
 msgstr "Systemweites mobiles Thema"
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:474
 msgid "Theme for mobile devices"
 msgstr "Thema für mobile Geräte"
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:475
 msgid "SSL link policy"
 msgstr "Regeln für SSL Links"
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:475
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr "Bestimmt, ob generierte Links SSL verwenden müssen"
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:476
+msgid "'Share' element"
+msgstr "'Teilen' Element"
+
+#: ../../mod/admin.php:476
+msgid "Activates the bbcode element 'share' for repeating items."
+msgstr "Aktiviert das bbcode Element 'Teilen' um Einträge zu wiederholen."
+
+#: ../../mod/admin.php:477
 msgid "Maximum image size"
 msgstr "Maximale Größe von Bildern"
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:477
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Maximale Upload-Größe von Bildern in Bytes. Standard ist 0, d.h. ohne Limit."
 
-#: ../../mod/admin.php:460
+#: ../../mod/admin.php:478
 msgid "Maximum image length"
 msgstr "Maximale Länge von Bildern"
 
-#: ../../mod/admin.php:460
+#: ../../mod/admin.php:478
 msgid ""
 "Maximum length in pixels of the longest side of uploaded images. Default is "
 "-1, which means no limits."
 msgstr "Maximale Länge in Pixeln der längsten Seite eines hoch geladenen Bildes. Grundeinstellung ist -1 was keine Einschränkung bedeutet."
 
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:479
 msgid "JPEG image quality"
 msgstr "Qualität des JPEG Bildes"
 
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:479
 msgid ""
 "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
 "100, which is full quality."
 msgstr "Hoch geladene JPEG Bilder werden mit dieser Qualität [0-100] gespeichert. Grundeinstellung ist 100, kein Qualitätsverlust."
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:481
 msgid "Register policy"
 msgstr "Registrierungsmethode"
 
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:482
 msgid "Maximum Daily Registrations"
 msgstr "Maximum täglicher Neuanmeldungen"
 
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:482
 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 "Wenn die Registrierung weiter oben erlaubt ist, regelt dies die maximale Anzahl von Neuanmeldungen pro Tag.   Wenn die Registrierung geschlossen ist, hat diese Einstellung keinen Effekt."
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:483
 msgid "Register text"
 msgstr "Registrierungstext"
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:483
 msgid "Will be displayed prominently on the registration page."
 msgstr "Wird gut sichtbar auf der Registrierungsseite angezeigt."
 
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:484
 msgid "Accounts abandoned after x days"
 msgstr "Nutzerkonten gelten nach x Tagen als unbenutzt"
 
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:484
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Konten nicht mehr benutzt werden. 0 eingeben für kein Limit."
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:485
 msgid "Allowed friend domains"
 msgstr "Erlaubte Domains für Kontakte"
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:485
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
 
-#: ../../mod/admin.php:468
+#: ../../mod/admin.php:486
 msgid "Allowed email domains"
 msgstr "Erlaubte Domains für E-Mails"
 
-#: ../../mod/admin.php:468
+#: ../../mod/admin.php:486
 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 "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
 
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:487
 msgid "Block public"
 msgstr "Öffentlichen Zugriff blockieren"
 
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:487
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr "Klicken, um öffentlichen Zugriff auf sonst öffentliche Profile zu blockieren, wenn man nicht eingeloggt ist."
 
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:488
 msgid "Force publish"
 msgstr "Erzwinge Veröffentlichung"
 
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:488
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Klicken, um Anzeige aller Profile dieses Servers im Verzeichnis zu erzwingen."
 
-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:489
 msgid "Global directory update URL"
 msgstr "URL für Updates beim weltweiten Verzeichnis"
 
-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:489
 msgid ""
 "URL to update the global directory. If this is not set, the global directory"
 " is completely unavailable to the application."
 msgstr "URL für Update des globalen Verzeichnisses. Wenn nichts eingetragen ist, bleibt das globale Verzeichnis unerreichbar."
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:490
 msgid "Allow threaded items"
 msgstr "Erlaube Threads in Diskussionen"
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:490
 msgid "Allow infinite level threading for items on this site."
 msgstr "Erlaube ein unendliches Level für Threads auf dieser Seite."
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:491
 msgid "Private posts by default for new users"
 msgstr "Private Beiträge als Standard für neue Nutzer"
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:491
 msgid ""
 "Set default post permissions for all new members to the default privacy "
 "group rather than public."
 msgstr "Die Standard-Zugriffsrechte für neue Nutzer werden so gesetzt, dass als Voreinstellung in die private Gruppe gepostet wird anstelle von öffentlichen Beiträgen."
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:493
 msgid "Block multiple registrations"
 msgstr "Unterbinde Mehrfachregistrierung"
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:493
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr "Benutzern nicht erlauben, weitere Konten als zusätzliche Profile anzulegen."
 
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:494
 msgid "OpenID support"
 msgstr "OpenID Unterstützung"
 
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:494
 msgid "OpenID support for registration and logins."
 msgstr "OpenID-Unterstützung für Registrierung und Login."
 
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:495
 msgid "Fullname check"
 msgstr "Namen auf Vollständigkeit überprüfen"
 
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:495
 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr "Leerzeichen zwischen Vor- und Nachname im vollständigen Namen erzwingen, um SPAM zu vermeiden."
 
-#: ../../mod/admin.php:478
+#: ../../mod/admin.php:496
 msgid "UTF-8 Regular expressions"
 msgstr "UTF-8 Reguläre Ausdrücke"
 
-#: ../../mod/admin.php:478
+#: ../../mod/admin.php:496
 msgid "Use PHP UTF8 regular expressions"
 msgstr "PHP UTF8 Ausdrücke verwenden"
 
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:497
 msgid "Show Community Page"
 msgstr "Gemeinschaftsseite anzeigen"
 
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:497
 msgid ""
 "Display a Community page showing all recent public postings on this site."
 msgstr "Zeige die Gemeinschaftsseite mit allen öffentlichen Beiträgen auf diesem Server."
 
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:498
 msgid "Enable OStatus support"
 msgstr "OStatus Unterstützung aktivieren"
 
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:498
 msgid ""
 "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All "
 "communications in OStatus are public, so privacy warnings will be "
 "occasionally displayed."
 msgstr "Biete die eingebaute OStatus (identi.ca, status.net, etc.) Unterstützung an. Jede Kommunikation in OStatus ist öffentlich, Privatsphäre Warnungen werden nur bei Bedarf angezeigt."
 
-#: ../../mod/admin.php:481
+#: ../../mod/admin.php:499
 msgid "Enable Diaspora support"
 msgstr "Diaspora-Support aktivieren"
 
-#: ../../mod/admin.php:481
+#: ../../mod/admin.php:499
 msgid "Provide built-in Diaspora network compatibility."
 msgstr "Verwende die eingebaute Diaspora-Verknüpfung."
 
-#: ../../mod/admin.php:482
+#: ../../mod/admin.php:500
 msgid "Only allow Friendica contacts"
 msgstr "Nur Friendica-Kontakte erlauben"
 
-#: ../../mod/admin.php:482
+#: ../../mod/admin.php:500
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr "Alle Kontakte müssen das Friendica Protokoll nutzen. Alle anderen Kommunikationsprotokolle werden deaktiviert."
 
-#: ../../mod/admin.php:483
+#: ../../mod/admin.php:501
 msgid "Verify SSL"
 msgstr "SSL Überprüfen"
 
-#: ../../mod/admin.php:483
+#: ../../mod/admin.php:501
 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 "Wenn gewollt, kann man hier eine strenge Zertifikatkontrolle einstellen. Das bedeutet, dass man zu keinen Seiten mit selbst unterzeichnetem SSL eine Verbindung herstellen kann."
 
-#: ../../mod/admin.php:484
+#: ../../mod/admin.php:502
 msgid "Proxy user"
 msgstr "Proxy Nutzer"
 
-#: ../../mod/admin.php:485
+#: ../../mod/admin.php:503
 msgid "Proxy URL"
 msgstr "Proxy URL"
 
-#: ../../mod/admin.php:486
+#: ../../mod/admin.php:504
 msgid "Network timeout"
 msgstr "Netzwerk Wartezeit"
 
-#: ../../mod/admin.php:486
+#: ../../mod/admin.php:504
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen)."
 
-#: ../../mod/admin.php:487
+#: ../../mod/admin.php:505
 msgid "Delivery interval"
 msgstr "Zustellungsintervall"
 
-#: ../../mod/admin.php:487
+#: ../../mod/admin.php:505
 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 "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl an Sekunden, um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared-Hosts, 2-3 für VPS, 0-1 für große dedizierte Server."
 
-#: ../../mod/admin.php:488
+#: ../../mod/admin.php:506
 msgid "Poll interval"
 msgstr "Abfrageintervall"
 
-#: ../../mod/admin.php:488
+#: ../../mod/admin.php:506
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr "Verzögere Hintergrundprozesse, um diese Anzahl an Sekunden um die Systemlast zu reduzieren. Bei 0 Sekunden wird das Auslieferungsintervall verwendet."
 
-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:507
 msgid "Maximum Load Average"
 msgstr "Maximum Load Average"
 
-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:507
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "Maximale Systemlast bevor Verteil- und Empfangsprozesse verschoben werden - Standard 50"
 
-#: ../../mod/admin.php:506
+#: ../../mod/admin.php:509
+msgid "Use MySQL full text engine"
+msgstr "Nutze MySQL full text engine"
+
+#: ../../mod/admin.php:509
+msgid ""
+"Activates the full text engine. Speeds up search - but can only search for "
+"four and more characters."
+msgstr "Aktiviert die 'full text engine'. Beschleunigt die Suche - aber es kann nur nach vier oder mehr Zeichen gesucht werden."
+
+#: ../../mod/admin.php:510
+msgid "Path to item cache"
+msgstr "Pfad zum Eintrag Cache"
+
+#: ../../mod/admin.php:511
+msgid "Cache duration in seconds"
+msgstr "Cache-Dauer in Sekunden"
+
+#: ../../mod/admin.php:511
+msgid ""
+"How long should the cache files be hold? Default value is 86400 seconds (One"
+" day)."
+msgstr "Wie lange sollen die Dateien im Cache vorgehalten werden? Standardwert ist 86400 Sekunden (ein Tag)."
+
+#: ../../mod/admin.php:512
+msgid "Path for lock file"
+msgstr "Pfad für die Sperrdatei"
+
+#: ../../mod/admin.php:513
+msgid "Temp path"
+msgstr "Temp Pfad"
+
+#: ../../mod/admin.php:514
+msgid "Base path to installation"
+msgstr "Basis-Pfad zur Installation"
+
+#: ../../mod/admin.php:532
 msgid "Update has been marked successful"
 msgstr "Update wurde als erfolgreich markiert"
 
-#: ../../mod/admin.php:516
+#: ../../mod/admin.php:542
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr "Ausführung von %s schlug fehl. Systemprotokolle prüfen."
 
-#: ../../mod/admin.php:519
+#: ../../mod/admin.php:545
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "Update %s war erfolgreich."
 
-#: ../../mod/admin.php:523
+#: ../../mod/admin.php:549
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr "Update %s hat keinen Status zurückgegeben. Unbekannter Status."
 
-#: ../../mod/admin.php:526
+#: ../../mod/admin.php:552
 #, php-format
 msgid "Update function %s could not be found."
 msgstr "Updatefunktion %s konnte nicht gefunden werden."
 
-#: ../../mod/admin.php:541
+#: ../../mod/admin.php:567
 msgid "No failed updates."
 msgstr "Keine fehlgeschlagenen Updates."
 
-#: ../../mod/admin.php:545
+#: ../../mod/admin.php:571
 msgid "Failed Updates"
 msgstr "Fehlgeschlagene Updates"
 
-#: ../../mod/admin.php:546
+#: ../../mod/admin.php:572
 msgid ""
 "This does not include updates prior to 1139, which did not return a status."
 msgstr "Ohne Updates vor 1139, da diese keinen Status zurückgegeben haben."
 
-#: ../../mod/admin.php:547
+#: ../../mod/admin.php:573
 msgid "Mark success (if update was manually applied)"
 msgstr "Als erfolgreich markieren (falls das Update manuell installiert wurde)"
 
-#: ../../mod/admin.php:548
+#: ../../mod/admin.php:574
 msgid "Attempt to execute this update step automatically"
 msgstr "Versuchen, diesen Schritt automatisch auszuführen"
 
-#: ../../mod/admin.php:573
+#: ../../mod/admin.php:599
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] "%s Benutzer geblockt/freigegeben"
 msgstr[1] "%s Benutzer geblockt/freigegeben"
 
-#: ../../mod/admin.php:580
+#: ../../mod/admin.php:606
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] "%s Nutzer gelöscht"
 msgstr[1] "%s Nutzer gelöscht"
 
-#: ../../mod/admin.php:619
+#: ../../mod/admin.php:645
 #, php-format
 msgid "User '%s' deleted"
 msgstr "Nutzer '%s' gelöscht"
 
-#: ../../mod/admin.php:627
+#: ../../mod/admin.php:653
 #, php-format
 msgid "User '%s' unblocked"
 msgstr "Nutzer '%s' entsperrt"
 
-#: ../../mod/admin.php:627
+#: ../../mod/admin.php:653
 #, php-format
 msgid "User '%s' blocked"
 msgstr "Nutzer '%s' gesperrt"
 
-#: ../../mod/admin.php:693
+#: ../../mod/admin.php:729
 msgid "select all"
 msgstr "Alle auswählen"
 
-#: ../../mod/admin.php:694
+#: ../../mod/admin.php:730
 msgid "User registrations waiting for confirm"
 msgstr "Neuanmeldungen, die auf deine Bestätigung warten"
 
-#: ../../mod/admin.php:695
+#: ../../mod/admin.php:731
 msgid "Request date"
 msgstr "Anfragedatum"
 
-#: ../../mod/admin.php:695 ../../mod/admin.php:705
+#: ../../mod/admin.php:731 ../../mod/admin.php:741
 #: ../../include/contact_selectors.php:79
 #: ../../include/contact_selectors.php:86
 msgid "Email"
 msgstr "E-Mail"
 
-#: ../../mod/admin.php:696
+#: ../../mod/admin.php:732
 msgid "No registrations."
 msgstr "Keine Neuanmeldungen."
 
-#: ../../mod/admin.php:698
+#: ../../mod/admin.php:734
 msgid "Deny"
 msgstr "Verwehren"
 
-#: ../../mod/admin.php:702
+#: ../../mod/admin.php:738
 msgid "Site admin"
 msgstr "Seitenadministrator"
 
-#: ../../mod/admin.php:705
+#: ../../mod/admin.php:741
 msgid "Register date"
 msgstr "Anmeldedatum"
 
-#: ../../mod/admin.php:705
+#: ../../mod/admin.php:741
 msgid "Last login"
 msgstr "Letzte Anmeldung"
 
-#: ../../mod/admin.php:705
+#: ../../mod/admin.php:741
 msgid "Last item"
 msgstr "Letzter Beitrag"
 
-#: ../../mod/admin.php:705
+#: ../../mod/admin.php:741
 msgid "Account"
 msgstr "Nutzerkonto"
 
-#: ../../mod/admin.php:707
+#: ../../mod/admin.php:743
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Die markierten Nutzer werden gelöscht!\\n\\nAlle Beiträge, die diese Nutzer auf dieser Seite veröffentlicht haben, werden permanent gelöscht!\\n\\nBist du sicher?"
 
-#: ../../mod/admin.php:708
+#: ../../mod/admin.php:744
 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 "Der Nutzer {0} wird gelöscht!\\n\\nAlles was dieser Nutzer auf dieser Seite veröffentlicht hat, wird permanent gelöscht!\\n\\nBist du sicher?"
 
-#: ../../mod/admin.php:749
+#: ../../mod/admin.php:785
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Plugin %s deaktiviert."
 
-#: ../../mod/admin.php:753
+#: ../../mod/admin.php:789
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Plugin %s aktiviert."
 
-#: ../../mod/admin.php:763 ../../mod/admin.php:961
+#: ../../mod/admin.php:799 ../../mod/admin.php:997
 msgid "Disable"
 msgstr "Ausschalten"
 
-#: ../../mod/admin.php:765 ../../mod/admin.php:963
+#: ../../mod/admin.php:801 ../../mod/admin.php:999
 msgid "Enable"
 msgstr "Einschalten"
 
-#: ../../mod/admin.php:787 ../../mod/admin.php:992
+#: ../../mod/admin.php:823 ../../mod/admin.php:1028
 msgid "Toggle"
 msgstr "Umschalten"
 
-#: ../../mod/admin.php:795 ../../mod/admin.php:1002
+#: ../../mod/admin.php:831 ../../mod/admin.php:1038
 msgid "Author: "
 msgstr "Autor:"
 
-#: ../../mod/admin.php:796 ../../mod/admin.php:1003
+#: ../../mod/admin.php:832 ../../mod/admin.php:1039
 msgid "Maintainer: "
 msgstr "Betreuer:"
 
-#: ../../mod/admin.php:925
+#: ../../mod/admin.php:961
 msgid "No themes found."
 msgstr "Keine Themen gefunden."
 
-#: ../../mod/admin.php:984
+#: ../../mod/admin.php:1020
 msgid "Screenshot"
 msgstr "Bildschirmfoto"
 
-#: ../../mod/admin.php:1032
+#: ../../mod/admin.php:1068
 msgid "[Experimental]"
 msgstr "[Experimentell]"
 
-#: ../../mod/admin.php:1033
+#: ../../mod/admin.php:1069
 msgid "[Unsupported]"
 msgstr "[Nicht unterstützt]"
 
-#: ../../mod/admin.php:1060
+#: ../../mod/admin.php:1096
 msgid "Log settings updated."
 msgstr "Protokolleinstellungen aktualisiert."
 
-#: ../../mod/admin.php:1116
+#: ../../mod/admin.php:1152
 msgid "Clear"
 msgstr "löschen"
 
-#: ../../mod/admin.php:1122
+#: ../../mod/admin.php:1158
 msgid "Debugging"
 msgstr "Protokoll führen"
 
-#: ../../mod/admin.php:1123
+#: ../../mod/admin.php:1159
 msgid "Log file"
 msgstr "Protokolldatei"
 
-#: ../../mod/admin.php:1123
+#: ../../mod/admin.php:1159
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr "Webserver muss Schreibrechte besitzen. Abhängig vom Friendica-Installationsverzeichnis."
 
-#: ../../mod/admin.php:1124
+#: ../../mod/admin.php:1160
 msgid "Log level"
 msgstr "Protokoll-Level"
 
-#: ../../mod/admin.php:1174
+#: ../../mod/admin.php:1210
 msgid "Close"
 msgstr "Schließen"
 
-#: ../../mod/admin.php:1180
+#: ../../mod/admin.php:1216
 msgid "FTP Host"
 msgstr "FTP Host"
 
-#: ../../mod/admin.php:1181
+#: ../../mod/admin.php:1217
 msgid "FTP Path"
 msgstr "FTP Pfad"
 
-#: ../../mod/admin.php:1182
+#: ../../mod/admin.php:1218
 msgid "FTP User"
 msgstr "FTP Nutzername"
 
-#: ../../mod/admin.php:1183
+#: ../../mod/admin.php:1219
 msgid "FTP Password"
 msgstr "FTP Passwort"
 
-#: ../../mod/profile.php:21 ../../boot.php:1139
+#: ../../mod/profile.php:21 ../../boot.php:1172
 msgid "Requested profile is not available."
 msgstr "Das angefragte Profil ist nicht vorhanden."
 
-#: ../../mod/profile.php:155 ../../mod/display.php:87
+#: ../../mod/profile.php:155 ../../mod/display.php:95
 msgid "Access to this profile has been restricted."
 msgstr "Der Zugriff zu diesem Profil wurde eingeschränkt."
 
@@ -4252,7 +4332,7 @@ msgstr "{0} hat %ss Beitrag mit dem Schlagwort #%s versehen"
 msgid "{0} mentioned you in a post"
 msgstr "{0} hat dich in einem Beitrag erwähnt"
 
-#: ../../mod/nogroup.php:58
+#: ../../mod/nogroup.php:59
 msgid "Contacts who are not members of a group"
 msgstr "Kontakte, die keiner Gruppe zugewiesen sind"
 
@@ -4265,8 +4345,8 @@ msgid ""
 "Account not found and OpenID registration is not permitted on this site."
 msgstr "Nutzerkonto wurde nicht gefunden, und OpenID-Registrierung ist auf diesem Server nicht gestattet."
 
-#: ../../mod/openid.php:93 ../../include/auth.php:110
-#: ../../include/auth.php:173
+#: ../../mod/openid.php:93 ../../include/auth.php:112
+#: ../../include/auth.php:175
 msgid "Login failed."
 msgstr "Anmeldung fehlgeschlagen."
 
@@ -4287,11 +4367,11 @@ msgstr "Keine gemeinsamen Kontakte."
 msgid "%1$s is following %2$s's %3$s"
 msgstr "%1$s folgt %2$s %3$s"
 
-#: ../../mod/share.php:28
+#: ../../mod/share.php:43
 msgid "link"
 msgstr "Link"
 
-#: ../../mod/display.php:162
+#: ../../mod/display.php:170
 msgid "Item has been removed."
 msgstr "Eintrag wurde entfernt."
 
@@ -4303,330 +4383,331 @@ msgstr "Anwendungen"
 msgid "No installed applications."
 msgstr "Keine Applikationen installiert."
 
-#: ../../mod/search.php:99 ../../include/text.php:685
-#: ../../include/text.php:686 ../../include/nav.php:91
+#: ../../mod/search.php:99 ../../include/text.php:739
+#: ../../include/text.php:740 ../../include/nav.php:91
 msgid "Search"
 msgstr "Suche"
 
-#: ../../mod/profiles.php:21 ../../mod/profiles.php:441
-#: ../../mod/profiles.php:555 ../../mod/dfrn_confirm.php:62
+#: ../../mod/profiles.php:20 ../../mod/profiles.php:135
+#: ../../mod/profiles.php:162 ../../mod/profiles.php:576
+#: ../../mod/dfrn_confirm.php:62
 msgid "Profile not found."
 msgstr "Profil nicht gefunden."
 
-#: ../../mod/profiles.php:31
+#: ../../mod/profiles.php:39
+msgid "Profile deleted."
+msgstr "Profil gelöscht."
+
+#: ../../mod/profiles.php:57 ../../mod/profiles.php:91
+msgid "Profile-"
+msgstr "Profil-"
+
+#: ../../mod/profiles.php:76 ../../mod/profiles.php:119
+msgid "New profile created."
+msgstr "Neues Profil angelegt."
+
+#: ../../mod/profiles.php:97
+msgid "Profile unavailable to clone."
+msgstr "Profil nicht zum Duplizieren verfügbar."
+
+#: ../../mod/profiles.php:172
 msgid "Profile Name is required."
 msgstr "Profilname ist erforderlich."
 
-#: ../../mod/profiles.php:178
+#: ../../mod/profiles.php:319
 msgid "Marital Status"
 msgstr "Familienstand"
 
-#: ../../mod/profiles.php:182
+#: ../../mod/profiles.php:323
 msgid "Romantic Partner"
 msgstr "Romanze"
 
-#: ../../mod/profiles.php:186
+#: ../../mod/profiles.php:327
 msgid "Likes"
 msgstr "Likes"
 
-#: ../../mod/profiles.php:190
+#: ../../mod/profiles.php:331
 msgid "Dislikes"
 msgstr "Dislikes"
 
-#: ../../mod/profiles.php:194
+#: ../../mod/profiles.php:335
 msgid "Work/Employment"
 msgstr "Arbeit / Beschäftigung"
 
-#: ../../mod/profiles.php:197
+#: ../../mod/profiles.php:338
 msgid "Religion"
 msgstr "Religion"
 
-#: ../../mod/profiles.php:201
+#: ../../mod/profiles.php:342
 msgid "Political Views"
 msgstr "Politische Ansichten"
 
-#: ../../mod/profiles.php:205
+#: ../../mod/profiles.php:346
 msgid "Gender"
 msgstr "Geschlecht"
 
-#: ../../mod/profiles.php:209
+#: ../../mod/profiles.php:350
 msgid "Sexual Preference"
 msgstr "Sexuelle Vorlieben"
 
-#: ../../mod/profiles.php:213
+#: ../../mod/profiles.php:354
 msgid "Homepage"
 msgstr "Webseite"
 
-#: ../../mod/profiles.php:217
+#: ../../mod/profiles.php:358
 msgid "Interests"
 msgstr "Interessen"
 
-#: ../../mod/profiles.php:221
+#: ../../mod/profiles.php:362
 msgid "Address"
 msgstr "Adresse"
 
-#: ../../mod/profiles.php:228 ../../addon/dav/common/wdcal_edit.inc.php:183
+#: ../../mod/profiles.php:369 ../../addon/dav/common/wdcal_edit.inc.php:183
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:183
 msgid "Location"
 msgstr "Wohnort"
 
-#: ../../mod/profiles.php:311
+#: ../../mod/profiles.php:452
 msgid "Profile updated."
 msgstr "Profil aktualisiert."
 
-#: ../../mod/profiles.php:378
+#: ../../mod/profiles.php:519
 msgid " and "
 msgstr " und "
 
-#: ../../mod/profiles.php:386
+#: ../../mod/profiles.php:527
 msgid "public profile"
 msgstr "öffentliches Profil"
 
-#: ../../mod/profiles.php:389
+#: ../../mod/profiles.php:530
 #, php-format
 msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
 msgstr "%1$s hat %2$s geändert auf &ldquo;%3$s&rdquo;"
 
-#: ../../mod/profiles.php:390
+#: ../../mod/profiles.php:531
 #, php-format
 msgid " - Visit %1$s's %2$s"
 msgstr " – %1$ss %2$s besuchen"
 
-#: ../../mod/profiles.php:393
+#: ../../mod/profiles.php:534
 #, php-format
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr "%1$s hat folgendes aktualisiert %2$s, verändert wurde %3$s."
 
-#: ../../mod/profiles.php:460
-msgid "Profile deleted."
-msgstr "Profil gelöscht."
-
-#: ../../mod/profiles.php:478 ../../mod/profiles.php:512
-msgid "Profile-"
-msgstr "Profil-"
-
-#: ../../mod/profiles.php:497 ../../mod/profiles.php:539
-msgid "New profile created."
-msgstr "Neues Profil angelegt."
-
-#: ../../mod/profiles.php:518
-msgid "Profile unavailable to clone."
-msgstr "Profil nicht zum Duplizieren verfügbar."
-
-#: ../../mod/profiles.php:583
+#: ../../mod/profiles.php:602
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr "Liste der Kontakte vor Betrachtern dieses Profils verbergen?"
 
-#: ../../mod/profiles.php:603
+#: ../../mod/profiles.php:622
 msgid "Edit Profile Details"
 msgstr "Profil bearbeiten"
 
-#: ../../mod/profiles.php:605
+#: ../../mod/profiles.php:624
 msgid "Change Profile Photo"
 msgstr "Profilbild ändern"
 
-#: ../../mod/profiles.php:606
+#: ../../mod/profiles.php:625
 msgid "View this profile"
 msgstr "Dieses Profil anzeigen"
 
-#: ../../mod/profiles.php:607
+#: ../../mod/profiles.php:626
 msgid "Create a new profile using these settings"
 msgstr "Neues Profil anlegen und diese Einstellungen verwenden"
 
-#: ../../mod/profiles.php:608
+#: ../../mod/profiles.php:627
 msgid "Clone this profile"
 msgstr "Dieses Profil duplizieren"
 
-#: ../../mod/profiles.php:609
+#: ../../mod/profiles.php:628
 msgid "Delete this profile"
 msgstr "Dieses Profil löschen"
 
-#: ../../mod/profiles.php:610
+#: ../../mod/profiles.php:629
 msgid "Profile Name:"
 msgstr "Profilname:"
 
-#: ../../mod/profiles.php:611
+#: ../../mod/profiles.php:630
 msgid "Your Full Name:"
 msgstr "Dein kompletter Name:"
 
-#: ../../mod/profiles.php:612
+#: ../../mod/profiles.php:631
 msgid "Title/Description:"
 msgstr "Titel/Beschreibung:"
 
-#: ../../mod/profiles.php:613
+#: ../../mod/profiles.php:632
 msgid "Your Gender:"
 msgstr "Dein Geschlecht:"
 
-#: ../../mod/profiles.php:614
+#: ../../mod/profiles.php:633
 #, php-format
 msgid "Birthday (%s):"
 msgstr "Geburtstag (%s):"
 
-#: ../../mod/profiles.php:615
+#: ../../mod/profiles.php:634
 msgid "Street Address:"
 msgstr "Adresse:"
 
-#: ../../mod/profiles.php:616
+#: ../../mod/profiles.php:635
 msgid "Locality/City:"
 msgstr "Wohnort:"
 
-#: ../../mod/profiles.php:617
+#: ../../mod/profiles.php:636
 msgid "Postal/Zip Code:"
 msgstr "Postleitzahl:"
 
-#: ../../mod/profiles.php:618
+#: ../../mod/profiles.php:637
 msgid "Country:"
 msgstr "Land:"
 
-#: ../../mod/profiles.php:619
+#: ../../mod/profiles.php:638
 msgid "Region/State:"
 msgstr "Region/Bundesstaat:"
 
-#: ../../mod/profiles.php:620
+#: ../../mod/profiles.php:639
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr "<span class=\"heart\">&hearts;</span> Beziehungsstatus:"
 
-#: ../../mod/profiles.php:621
+#: ../../mod/profiles.php:640
 msgid "Who: (if applicable)"
 msgstr "Wer: (falls anwendbar)"
 
-#: ../../mod/profiles.php:622
+#: ../../mod/profiles.php:641
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com"
 
-#: ../../mod/profiles.php:623
+#: ../../mod/profiles.php:642
 msgid "Since [date]:"
 msgstr "Seit [Datum]:"
 
-#: ../../mod/profiles.php:624 ../../include/profile_advanced.php:46
+#: ../../mod/profiles.php:643 ../../include/profile_advanced.php:46
 msgid "Sexual Preference:"
 msgstr "Sexuelle Vorlieben:"
 
-#: ../../mod/profiles.php:625
+#: ../../mod/profiles.php:644
 msgid "Homepage URL:"
 msgstr "Adresse der Homepage:"
 
-#: ../../mod/profiles.php:626 ../../include/profile_advanced.php:50
+#: ../../mod/profiles.php:645 ../../include/profile_advanced.php:50
 msgid "Hometown:"
 msgstr "Heimatort:"
 
-#: ../../mod/profiles.php:627 ../../include/profile_advanced.php:54
+#: ../../mod/profiles.php:646 ../../include/profile_advanced.php:54
 msgid "Political Views:"
 msgstr "Politische Ansichten:"
 
-#: ../../mod/profiles.php:628
+#: ../../mod/profiles.php:647
 msgid "Religious Views:"
 msgstr "Religiöse Ansichten:"
 
-#: ../../mod/profiles.php:629
+#: ../../mod/profiles.php:648
 msgid "Public Keywords:"
 msgstr "Öffentliche Schlüsselwörter:"
 
-#: ../../mod/profiles.php:630
+#: ../../mod/profiles.php:649
 msgid "Private Keywords:"
 msgstr "Private Schlüsselwörter:"
 
-#: ../../mod/profiles.php:631 ../../include/profile_advanced.php:62
+#: ../../mod/profiles.php:650 ../../include/profile_advanced.php:62
 msgid "Likes:"
 msgstr "Likes:"
 
-#: ../../mod/profiles.php:632 ../../include/profile_advanced.php:64
+#: ../../mod/profiles.php:651 ../../include/profile_advanced.php:64
 msgid "Dislikes:"
 msgstr "Dislikes:"
 
-#: ../../mod/profiles.php:633
+#: ../../mod/profiles.php:652
 msgid "Example: fishing photography software"
 msgstr "Beispiel: Fischen Fotografie Software"
 
-#: ../../mod/profiles.php:634
+#: ../../mod/profiles.php:653
 msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr "(Wird verwendet, um potentielle Freunde zu finden, könnte von Fremden eingesehen werden)"
 
-#: ../../mod/profiles.php:635
+#: ../../mod/profiles.php:654
 msgid "(Used for searching profiles, never shown to others)"
 msgstr "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)"
 
-#: ../../mod/profiles.php:636
+#: ../../mod/profiles.php:655
 msgid "Tell us about yourself..."
 msgstr "Erzähle uns ein bisschen von dir …"
 
-#: ../../mod/profiles.php:637
+#: ../../mod/profiles.php:656
 msgid "Hobbies/Interests"
 msgstr "Hobbies/Interessen"
 
-#: ../../mod/profiles.php:638
+#: ../../mod/profiles.php:657
 msgid "Contact information and Social Networks"
 msgstr "Kontaktinformationen und Soziale Netzwerke"
 
-#: ../../mod/profiles.php:639
+#: ../../mod/profiles.php:658
 msgid "Musical interests"
 msgstr "Musikalische Interessen"
 
-#: ../../mod/profiles.php:640
+#: ../../mod/profiles.php:659
 msgid "Books, literature"
 msgstr "Literatur/Bücher"
 
-#: ../../mod/profiles.php:641
+#: ../../mod/profiles.php:660
 msgid "Television"
 msgstr "Fernsehen"
 
-#: ../../mod/profiles.php:642
+#: ../../mod/profiles.php:661
 msgid "Film/dance/culture/entertainment"
 msgstr "Filme/Tänze/Kultur/Unterhaltung"
 
-#: ../../mod/profiles.php:643
+#: ../../mod/profiles.php:662
 msgid "Love/romance"
 msgstr "Liebesleben"
 
-#: ../../mod/profiles.php:644
+#: ../../mod/profiles.php:663
 msgid "Work/employment"
 msgstr "Arbeit/Beschäftigung"
 
-#: ../../mod/profiles.php:645
+#: ../../mod/profiles.php:664
 msgid "School/education"
 msgstr "Schule/Ausbildung"
 
-#: ../../mod/profiles.php:650
+#: ../../mod/profiles.php:669
 msgid ""
 "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
 "be visible to anybody using the internet."
 msgstr "Dies ist dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden Nutzer des Internets sichtbar sein."
 
-#: ../../mod/profiles.php:660 ../../mod/directory.php:111
+#: ../../mod/profiles.php:679 ../../mod/directory.php:111
 #: ../../addon/forumdirectory/forumdirectory.php:133
 msgid "Age: "
 msgstr "Alter: "
 
-#: ../../mod/profiles.php:699
+#: ../../mod/profiles.php:718
 msgid "Edit/Manage Profiles"
 msgstr "Verwalte/Editiere Profile"
 
-#: ../../mod/profiles.php:700 ../../boot.php:1257
+#: ../../mod/profiles.php:719 ../../boot.php:1292
 msgid "Change profile photo"
 msgstr "Profilbild ändern"
 
-#: ../../mod/profiles.php:701 ../../boot.php:1258
+#: ../../mod/profiles.php:720 ../../boot.php:1293
 msgid "Create New Profile"
 msgstr "Neues Profil anlegen"
 
-#: ../../mod/profiles.php:712 ../../boot.php:1268
+#: ../../mod/profiles.php:731 ../../boot.php:1303
 msgid "Profile Image"
 msgstr "Profilbild"
 
-#: ../../mod/profiles.php:714 ../../boot.php:1271
+#: ../../mod/profiles.php:733 ../../boot.php:1306
 msgid "visible to everybody"
 msgstr "sichtbar für jeden"
 
-#: ../../mod/profiles.php:715 ../../boot.php:1272
+#: ../../mod/profiles.php:734 ../../boot.php:1307
 msgid "Edit visibility"
 msgstr "Sichtbarkeit bearbeiten"
 
-#: ../../mod/filer.php:29 ../../include/conversation.php:909
-#: ../../include/conversation.php:927
+#: ../../mod/filer.php:30 ../../include/conversation.php:945
+#: ../../include/conversation.php:963
 msgid "Save to Folder:"
 msgstr "In diesen Ordner verschieben:"
 
-#: ../../mod/filer.php:29
+#: ../../mod/filer.php:30
 msgid "- select -"
 msgstr "- auswählen -"
 
@@ -4749,19 +4830,19 @@ msgstr "Geschlecht:"
 
 #: ../../mod/directory.php:136
 #: ../../addon/forumdirectory/forumdirectory.php:158
-#: ../../include/profile_advanced.php:17 ../../boot.php:1293
+#: ../../include/profile_advanced.php:17 ../../boot.php:1328
 msgid "Gender:"
 msgstr "Geschlecht:"
 
 #: ../../mod/directory.php:138
 #: ../../addon/forumdirectory/forumdirectory.php:160
-#: ../../include/profile_advanced.php:37 ../../boot.php:1296
+#: ../../include/profile_advanced.php:37 ../../boot.php:1331
 msgid "Status:"
 msgstr "Status:"
 
 #: ../../mod/directory.php:140
 #: ../../addon/forumdirectory/forumdirectory.php:162
-#: ../../include/profile_advanced.php:48 ../../boot.php:1298
+#: ../../include/profile_advanced.php:48 ../../boot.php:1333
 msgid "Homepage:"
 msgstr "Homepage:"
 
@@ -4771,37 +4852,37 @@ msgstr "Homepage:"
 msgid "About:"
 msgstr "Über:"
 
-#: ../../mod/directory.php:180
-#: ../../addon/forumdirectory/forumdirectory.php:202
+#: ../../mod/directory.php:187
+#: ../../addon/forumdirectory/forumdirectory.php:203
 msgid "No entries (some entries may be hidden)."
 msgstr "Keine Einträge (einige Einträge könnten versteckt sein)."
 
-#: ../../mod/invite.php:35
+#: ../../mod/invite.php:37
 #, php-format
 msgid "%s : Not a valid email address."
 msgstr "%s: Keine gültige Email Adresse."
 
-#: ../../mod/invite.php:59
+#: ../../mod/invite.php:61
 msgid "Please join us on Friendica"
 msgstr "Bitte trete bei uns auf Friendica bei"
 
-#: ../../mod/invite.php:69
+#: ../../mod/invite.php:71
 #, php-format
 msgid "%s : Message delivery failed."
 msgstr "%s: Zustellung der Nachricht fehlgeschlagen."
 
-#: ../../mod/invite.php:73
+#: ../../mod/invite.php:75
 #, php-format
 msgid "%d message sent."
 msgid_plural "%d messages sent."
 msgstr[0] "%d Nachricht gesendet."
 msgstr[1] "%d Nachrichten gesendet."
 
-#: ../../mod/invite.php:92
+#: ../../mod/invite.php:94
 msgid "You have no more invitations available"
 msgstr "Du hast keine weiteren Einladungen"
 
-#: ../../mod/invite.php:100
+#: ../../mod/invite.php:102
 #, php-format
 msgid ""
 "Visit %s for a list of public sites that you can join. Friendica members on "
@@ -4809,14 +4890,14 @@ msgid ""
 " other social networks."
 msgstr "Besuche %s für eine Liste der öffentlichen Server, denen du beitreten kannst. Friendica Mitglieder unterschiedlicher Server können sich sowohl alle miteinander verbinden, als auch mit Mitgliedern anderer Sozialer Netzwerke."
 
-#: ../../mod/invite.php:102
+#: ../../mod/invite.php:104
 #, php-format
 msgid ""
 "To accept this invitation, please visit and register at %s or any other "
 "public Friendica website."
 msgstr "Um diese Kontaktanfrage zu akzeptieren, besuche und registriere dich bitte bei %s oder einer anderen öffentlichen Friendica Website."
 
-#: ../../mod/invite.php:103
+#: ../../mod/invite.php:105
 #, php-format
 msgid ""
 "Friendica sites all inter-connect to create a huge privacy-enhanced social "
@@ -4825,36 +4906,36 @@ msgid ""
 "sites you can join."
 msgstr "Friendica Server verbinden sich alle untereinander, um ein großes datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden. Besuche %s für eine Liste alternativer Friendica Server, denen du beitreten kannst."
 
-#: ../../mod/invite.php:106
+#: ../../mod/invite.php:108
 msgid ""
 "Our apologies. This system is not currently configured to connect with other"
 " public sites or invite members."
 msgstr "Es tut uns leid. Dieses System ist zurzeit nicht dafür konfiguriert, sich mit anderen öffentlichen Seiten zu verbinden oder Mitglieder einzuladen."
 
-#: ../../mod/invite.php:111
+#: ../../mod/invite.php:113
 msgid "Send invitations"
 msgstr "Einladungen senden"
 
-#: ../../mod/invite.php:112
+#: ../../mod/invite.php:114
 msgid "Enter email addresses, one per line:"
 msgstr "E-Mail-Adressen eingeben, eine pro Zeile:"
 
-#: ../../mod/invite.php:114
+#: ../../mod/invite.php:116
 msgid ""
 "You are cordially invited to join me and other close friends on Friendica - "
 "and help us to create a better social web."
 msgstr "Du bist herzlich dazu eingeladen, dich mir und anderen guten Freunden auf Friendica anzuschließen - und ein besseres Soziales Netz aufzubauen."
 
-#: ../../mod/invite.php:116
+#: ../../mod/invite.php:118
 msgid "You will need to supply this invitation code: $invite_code"
 msgstr "Du benötigst den folgenden Einladungscode: $invite_code"
 
-#: ../../mod/invite.php:116
+#: ../../mod/invite.php:118
 msgid ""
 "Once you have registered, please connect with me via my profile page at:"
 msgstr "Sobald du registriert bist, kontaktiere mich bitte auf meiner Profilseite:"
 
-#: ../../mod/invite.php:118
+#: ../../mod/invite.php:120
 msgid ""
 "For more information about the Friendica project and why we feel it is "
 "important, please visit http://friendica.com"
@@ -4937,12 +5018,12 @@ msgstr "Deine Kontaktreferenzen konnten nicht in unserem System gespeichert werd
 msgid "Unable to update your contact profile details on our system"
 msgstr "Die Updates für dein Profil konnten nicht gespeichert werden"
 
-#: ../../mod/dfrn_confirm.php:750
+#: ../../mod/dfrn_confirm.php:760
 #, php-format
 msgid "Connection accepted at %s"
 msgstr "Auf %s wurde die Verbindung akzeptiert"
 
-#: ../../mod/dfrn_confirm.php:799
+#: ../../mod/dfrn_confirm.php:809
 #, php-format
 msgid "%1$s has joined %2$s"
 msgstr "%1$s ist %2$s beigetreten"
@@ -4967,38 +5048,38 @@ msgstr "Google Account ID"
 msgid "Google+ Import Settings saved."
 msgstr "Google+ Import Einstellungen gespeichert."
 
-#: ../../addon/facebook/facebook.php:523
+#: ../../addon/facebook/facebook.php:525
 #: ../../addon.old/facebook/facebook.php:523
 msgid "Facebook disabled"
 msgstr "Facebook deaktiviert"
 
-#: ../../addon/facebook/facebook.php:528
+#: ../../addon/facebook/facebook.php:530
 #: ../../addon.old/facebook/facebook.php:528
 msgid "Updating contacts"
 msgstr "Aktualisiere Kontakte"
 
-#: ../../addon/facebook/facebook.php:551 ../../addon/fbpost/fbpost.php:199
+#: ../../addon/facebook/facebook.php:553 ../../addon/fbpost/fbpost.php:203
 #: ../../addon.old/facebook/facebook.php:551
 #: ../../addon.old/fbpost/fbpost.php:192
 msgid "Facebook API key is missing."
 msgstr "Facebook-API-Schlüssel nicht gefunden"
 
-#: ../../addon/facebook/facebook.php:558
+#: ../../addon/facebook/facebook.php:560
 #: ../../addon.old/facebook/facebook.php:558
 msgid "Facebook Connect"
 msgstr "Mit Facebook verbinden"
 
-#: ../../addon/facebook/facebook.php:564
+#: ../../addon/facebook/facebook.php:566
 #: ../../addon.old/facebook/facebook.php:564
 msgid "Install Facebook connector for this account."
 msgstr "Facebook-Connector für dieses Konto installieren."
 
-#: ../../addon/facebook/facebook.php:571
+#: ../../addon/facebook/facebook.php:573
 #: ../../addon.old/facebook/facebook.php:571
 msgid "Remove Facebook connector"
 msgstr "Facebook-Connector entfernen"
 
-#: ../../addon/facebook/facebook.php:576 ../../addon/fbpost/fbpost.php:224
+#: ../../addon/facebook/facebook.php:578 ../../addon/fbpost/fbpost.php:228
 #: ../../addon.old/facebook/facebook.php:576
 #: ../../addon.old/fbpost/fbpost.php:217
 msgid ""
@@ -5006,63 +5087,63 @@ msgid ""
 "changed.]"
 msgstr "Neu authentifizieren [Das ist immer dann nötig, wenn du dein Facebook-Passwort geändert hast.]"
 
-#: ../../addon/facebook/facebook.php:583 ../../addon/fbpost/fbpost.php:231
+#: ../../addon/facebook/facebook.php:585 ../../addon/fbpost/fbpost.php:235
 #: ../../addon.old/facebook/facebook.php:583
 #: ../../addon.old/fbpost/fbpost.php:224
 msgid "Post to Facebook by default"
 msgstr "Veröffentliche standardmäßig bei Facebook"
 
-#: ../../addon/facebook/facebook.php:589
+#: ../../addon/facebook/facebook.php:591
 #: ../../addon.old/facebook/facebook.php:589
 msgid ""
 "Facebook friend linking has been disabled on this site. The following "
 "settings will have no effect."
 msgstr "Das Verlinken von Facebookkontakten wurde auf dieser Seite deaktiviert. Die folgenden Einstellungen haben keinen Effekt."
 
-#: ../../addon/facebook/facebook.php:593
+#: ../../addon/facebook/facebook.php:595
 #: ../../addon.old/facebook/facebook.php:593
 msgid ""
 "Facebook friend linking has been disabled on this site. If you disable it, "
 "you will be unable to re-enable it."
 msgstr "Das Verlinken von Facebookkontakten wurde auf dieser Seite deaktiviert. Wenn du es ausgeschaltet hast, kannst du es nicht wieder aktivieren."
 
-#: ../../addon/facebook/facebook.php:596
+#: ../../addon/facebook/facebook.php:598
 #: ../../addon.old/facebook/facebook.php:596
 msgid "Link all your Facebook friends and conversations on this website"
 msgstr "All meine Facebook-Kontakte und -Konversationen hier auf diese Website importieren"
 
-#: ../../addon/facebook/facebook.php:598
+#: ../../addon/facebook/facebook.php:600
 #: ../../addon.old/facebook/facebook.php:598
 msgid ""
 "Facebook conversations consist of your <em>profile wall</em> and your friend"
 " <em>stream</em>."
 msgstr "Facebook-Konversationen bestehen aus deinen Beiträgen auf deiner<em>Pinnwand</em>, sowie den Beiträgen deiner Freunde <em>Stream</em>."
 
-#: ../../addon/facebook/facebook.php:599
+#: ../../addon/facebook/facebook.php:601
 #: ../../addon.old/facebook/facebook.php:599
 msgid "On this website, your Facebook friend stream is only visible to you."
 msgstr "Hier auf dieser Webseite kannst nur du die Beiträge Deiner Facebook-Freunde (Stream) sehen."
 
-#: ../../addon/facebook/facebook.php:600
+#: ../../addon/facebook/facebook.php:602
 #: ../../addon.old/facebook/facebook.php:600
 msgid ""
 "The following settings determine the privacy of your Facebook profile wall "
 "on this website."
 msgstr "Mit den folgenden Einstellungen kannst du die Privatsphäre der Kopie Deiner Facebook-Pinnwand hier auf dieser Seite einstellen."
 
-#: ../../addon/facebook/facebook.php:604
+#: ../../addon/facebook/facebook.php:606
 #: ../../addon.old/facebook/facebook.php:604
 msgid ""
 "On this website your Facebook profile wall conversations will only be "
 "visible to you"
 msgstr "Meine Facebook-Pinnwand hier auf dieser Webseite nur für mich sichtbar machen"
 
-#: ../../addon/facebook/facebook.php:609
+#: ../../addon/facebook/facebook.php:611
 #: ../../addon.old/facebook/facebook.php:609
 msgid "Do not import your Facebook profile wall conversations"
 msgstr "Facebook-Pinnwand nicht importieren"
 
-#: ../../addon/facebook/facebook.php:611
+#: ../../addon/facebook/facebook.php:613
 #: ../../addon.old/facebook/facebook.php:611
 msgid ""
 "If you choose to link conversations and leave both of these boxes unchecked,"
@@ -5071,28 +5152,40 @@ msgid ""
 "who may see the conversations."
 msgstr "Wenn du Facebook-Konversationen importierst und diese beiden Häkchen nicht setzt, wird deine Facebook-Pinnwand mit der Pinnwand hier auf dieser Webseite vereinigt. Die Privatsphäre-Einstellungen für deine Pinnwand auf dieser Webseite geben dann an, wer die Konversationen sehen kann."
 
-#: ../../addon/facebook/facebook.php:616
+#: ../../addon/facebook/facebook.php:618
 #: ../../addon.old/facebook/facebook.php:616
 msgid "Comma separated applications to ignore"
 msgstr "Kommaseparierte Anwendungen, die ignoriert werden sollen"
 
-#: ../../addon/facebook/facebook.php:700
+#: ../../addon/facebook/facebook.php:702
 #: ../../addon.old/facebook/facebook.php:700
 msgid "Problems with Facebook Real-Time Updates"
 msgstr "Probleme mit Facebook Echtzeit-Updates"
 
-#: ../../addon/facebook/facebook.php:729
+#: ../../addon/facebook/facebook.php:704
+#: ../../addon/facebook/facebook.php:1202 ../../addon/fbpost/fbpost.php:817
+#: ../../addon/public_server/public_server.php:62
+#: ../../addon/testdrive/testdrive.php:67
+#: ../../addon.old/facebook/facebook.php:702
+#: ../../addon.old/facebook/facebook.php:1200
+#: ../../addon.old/fbpost/fbpost.php:661
+#: ../../addon.old/public_server/public_server.php:62
+#: ../../addon.old/testdrive/testdrive.php:67
+msgid "Administrator"
+msgstr "Administrator"
+
+#: ../../addon/facebook/facebook.php:731
 #: ../../addon.old/facebook/facebook.php:729
 msgid "Facebook Connector Settings"
 msgstr "Facebook-Verbindungseinstellungen"
 
-#: ../../addon/facebook/facebook.php:744 ../../addon/fbpost/fbpost.php:302
+#: ../../addon/facebook/facebook.php:746 ../../addon/fbpost/fbpost.php:310
 #: ../../addon.old/facebook/facebook.php:744
 #: ../../addon.old/fbpost/fbpost.php:255
 msgid "Facebook API Key"
 msgstr "Facebook API Schlüssel"
 
-#: ../../addon/facebook/facebook.php:754 ../../addon/fbpost/fbpost.php:309
+#: ../../addon/facebook/facebook.php:756 ../../addon/fbpost/fbpost.php:317
 #: ../../addon.old/facebook/facebook.php:754
 #: ../../addon.old/fbpost/fbpost.php:262
 msgid ""
@@ -5101,76 +5194,76 @@ msgid ""
 "using this form.<br><br>"
 msgstr "Fehler: du scheinst die App-ID und das App-Geheimnis in deiner .htconfig.php Datei angegeben zu haben. Solange sie dort festgelegt werden kannst du dieses Formular hier nicht verwenden.<br><br>"
 
-#: ../../addon/facebook/facebook.php:759
+#: ../../addon/facebook/facebook.php:761
 #: ../../addon.old/facebook/facebook.php:759
 msgid ""
 "Error: the given API Key seems to be incorrect (the application access token"
 " could not be retrieved)."
 msgstr "Fehler: der angegebene API Schlüssel scheint nicht korrekt zu sein (Zugriffstoken konnte nicht empfangen werden)."
 
-#: ../../addon/facebook/facebook.php:761
+#: ../../addon/facebook/facebook.php:763
 #: ../../addon.old/facebook/facebook.php:761
 msgid "The given API Key seems to work correctly."
 msgstr "Der angegebene API Schlüssel scheint korrekt zu funktionieren."
 
-#: ../../addon/facebook/facebook.php:763
+#: ../../addon/facebook/facebook.php:765
 #: ../../addon.old/facebook/facebook.php:763
 msgid ""
 "The correctness of the API Key could not be detected. Something strange's "
 "going on."
 msgstr "Die Richtigkeit des API Schlüssels konnte nicht gefunden werden. Irgendwas stimmt nicht."
 
-#: ../../addon/facebook/facebook.php:766 ../../addon/fbpost/fbpost.php:311
+#: ../../addon/facebook/facebook.php:768 ../../addon/fbpost/fbpost.php:319
 #: ../../addon.old/facebook/facebook.php:766
 #: ../../addon.old/fbpost/fbpost.php:264
 msgid "App-ID / API-Key"
 msgstr "App-ID / API-Key"
 
-#: ../../addon/facebook/facebook.php:767 ../../addon/fbpost/fbpost.php:312
+#: ../../addon/facebook/facebook.php:769 ../../addon/fbpost/fbpost.php:320
 #: ../../addon.old/facebook/facebook.php:767
 #: ../../addon.old/fbpost/fbpost.php:265
 msgid "Application secret"
 msgstr "Anwendungs-Geheimnis"
 
-#: ../../addon/facebook/facebook.php:768
+#: ../../addon/facebook/facebook.php:770
 #: ../../addon.old/facebook/facebook.php:768
 #, php-format
 msgid "Polling Interval in minutes (minimum %1$s minutes)"
 msgstr "Abfrageintervall in Minuten (min %1$s Minuten)"
 
-#: ../../addon/facebook/facebook.php:769
+#: ../../addon/facebook/facebook.php:771
 #: ../../addon.old/facebook/facebook.php:769
 msgid ""
 "Synchronize comments (no comments on Facebook are missed, at the cost of "
 "increased system load)"
 msgstr "Kommentare synchronisieren (Kein Kommentar von Facebook geht verloren, verursacht höhere Last auf dem Server)"
 
-#: ../../addon/facebook/facebook.php:773
+#: ../../addon/facebook/facebook.php:775
 #: ../../addon.old/facebook/facebook.php:773
 msgid "Real-Time Updates"
 msgstr "Echtzeit Aktualisierungen"
 
-#: ../../addon/facebook/facebook.php:777
+#: ../../addon/facebook/facebook.php:779
 #: ../../addon.old/facebook/facebook.php:777
 msgid "Real-Time Updates are activated."
 msgstr "Echtzeit-Updates sind aktiviert."
 
-#: ../../addon/facebook/facebook.php:778
+#: ../../addon/facebook/facebook.php:780
 #: ../../addon.old/facebook/facebook.php:778
 msgid "Deactivate Real-Time Updates"
 msgstr "Echtzeit-Updates deaktivieren"
 
-#: ../../addon/facebook/facebook.php:780
+#: ../../addon/facebook/facebook.php:782
 #: ../../addon.old/facebook/facebook.php:780
 msgid "Real-Time Updates not activated."
 msgstr "Echtzeit-Updates nicht aktiviert."
 
-#: ../../addon/facebook/facebook.php:780
+#: ../../addon/facebook/facebook.php:782
 #: ../../addon.old/facebook/facebook.php:780
 msgid "Activate Real-Time Updates"
 msgstr "Echtzeit-Updates aktivieren"
 
-#: ../../addon/facebook/facebook.php:799 ../../addon/fbpost/fbpost.php:329
+#: ../../addon/facebook/facebook.php:801 ../../addon/fbpost/fbpost.php:337
 #: ../../addon/dav/friendica/layout.fnk.php:361
 #: ../../addon.old/facebook/facebook.php:799
 #: ../../addon.old/fbpost/fbpost.php:282
@@ -5178,13 +5271,13 @@ msgstr "Echtzeit-Updates aktivieren"
 msgid "The new values have been saved."
 msgstr "Die neuen Einstellungen wurden gespeichert."
 
-#: ../../addon/facebook/facebook.php:823 ../../addon/fbpost/fbpost.php:348
+#: ../../addon/facebook/facebook.php:825 ../../addon/fbpost/fbpost.php:356
 #: ../../addon.old/facebook/facebook.php:823
 #: ../../addon.old/fbpost/fbpost.php:301
 msgid "Post to Facebook"
 msgstr "Bei Facebook veröffentlichen"
 
-#: ../../addon/facebook/facebook.php:921 ../../addon/fbpost/fbpost.php:446
+#: ../../addon/facebook/facebook.php:923 ../../addon/fbpost/fbpost.php:483
 #: ../../addon.old/facebook/facebook.php:921
 #: ../../addon.old/fbpost/fbpost.php:399
 msgid ""
@@ -5192,31 +5285,31 @@ msgid ""
 "conflict."
 msgstr "Beitrag wurde nicht bei Facebook veröffentlicht, da Konflikte bei den Multi-Netzwerk-Zugriffsrechten vorliegen."
 
-#: ../../addon/facebook/facebook.php:1149 ../../addon/fbpost/fbpost.php:722
+#: ../../addon/facebook/facebook.php:1151 ../../addon/fbpost/fbpost.php:762
 #: ../../addon.old/facebook/facebook.php:1149
 #: ../../addon.old/fbpost/fbpost.php:610
 msgid "View on Friendica"
 msgstr "In Friendica betrachten"
 
-#: ../../addon/facebook/facebook.php:1182 ../../addon/fbpost/fbpost.php:759
+#: ../../addon/facebook/facebook.php:1184 ../../addon/fbpost/fbpost.php:799
 #: ../../addon.old/facebook/facebook.php:1182
 #: ../../addon.old/fbpost/fbpost.php:643
 msgid "Facebook post failed. Queued for retry."
 msgstr "Veröffentlichung bei Facebook gescheitert. Wir versuchen es später erneut."
 
-#: ../../addon/facebook/facebook.php:1222 ../../addon/fbpost/fbpost.php:799
+#: ../../addon/facebook/facebook.php:1224 ../../addon/fbpost/fbpost.php:839
 #: ../../addon.old/facebook/facebook.php:1222
 #: ../../addon.old/fbpost/fbpost.php:683
 msgid "Your Facebook connection became invalid. Please Re-authenticate."
 msgstr "Deine Facebook Anmeldedaten sind ungültig geworden. Bitte re-authentifiziere dich."
 
-#: ../../addon/facebook/facebook.php:1223 ../../addon/fbpost/fbpost.php:800
+#: ../../addon/facebook/facebook.php:1225 ../../addon/fbpost/fbpost.php:840
 #: ../../addon.old/facebook/facebook.php:1223
 #: ../../addon.old/fbpost/fbpost.php:684
 msgid "Facebook connection became invalid"
 msgstr "Facebook Anmeldedaten sind ungültig geworden"
 
-#: ../../addon/facebook/facebook.php:1224 ../../addon/fbpost/fbpost.php:801
+#: ../../addon/facebook/facebook.php:1226 ../../addon/fbpost/fbpost.php:841
 #: ../../addon.old/facebook/facebook.php:1224
 #: ../../addon.old/fbpost/fbpost.php:685
 #, php-format
@@ -5241,60 +5334,69 @@ msgstr "StatusNet AutoFollow Einstellungen"
 msgid "Automatically follow any StatusNet followers/mentioners"
 msgstr "Automatisch allen StatusNet Followern/Erwähnungen folgen"
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:278
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:351
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:260
 msgid "Lifetime of the cache (in hours)"
 msgstr "Lebenszeit des Caches (in Stunden)"
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:283
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:356
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:265
 msgid "Cache Statistics"
 msgstr "Cache Statistik"
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:286
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:359
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:268
 msgid "Number of items"
 msgstr "Anzahl der Einträge"
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:288
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:361
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:270
 msgid "Size of the cache"
 msgstr "Größe des Caches"
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:290
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:363
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:272
 msgid "Delete the whole cache"
 msgstr "Cache leeren"
 
-#: ../../addon/fbpost/fbpost.php:179 ../../addon.old/fbpost/fbpost.php:172
+#: ../../addon/fbpost/fbpost.php:183 ../../addon.old/fbpost/fbpost.php:172
 msgid "Facebook Post disabled"
 msgstr "Nach Facebook senden deaktiviert"
 
-#: ../../addon/fbpost/fbpost.php:206 ../../addon.old/fbpost/fbpost.php:199
+#: ../../addon/fbpost/fbpost.php:210 ../../addon.old/fbpost/fbpost.php:199
 msgid "Facebook Post"
 msgstr "Facebook Relai"
 
-#: ../../addon/fbpost/fbpost.php:212 ../../addon.old/fbpost/fbpost.php:205
+#: ../../addon/fbpost/fbpost.php:216 ../../addon.old/fbpost/fbpost.php:205
 msgid "Install Facebook Post connector for this account."
 msgstr "Facebook-Connector für dieses Konto installieren."
 
-#: ../../addon/fbpost/fbpost.php:219 ../../addon.old/fbpost/fbpost.php:212
+#: ../../addon/fbpost/fbpost.php:223 ../../addon.old/fbpost/fbpost.php:212
 msgid "Remove Facebook Post connector"
 msgstr "Facebook-Connector entfernen"
 
-#: ../../addon/fbpost/fbpost.php:235
+#: ../../addon/fbpost/fbpost.php:239
 msgid "Suppress \"View on friendica\""
 msgstr "Unterdrücke \"Auf Friendica Ansehen\""
 
-#: ../../addon/fbpost/fbpost.php:245
+#: ../../addon/fbpost/fbpost.php:243
+msgid "Mirror wall posts from facebook to friendica."
+msgstr "Spiegle Pinnwandeinträge von Facebook auf friendica"
+
+#: ../../addon/fbpost/fbpost.php:253
 msgid "Post to page/group:"
 msgstr "Auf FB Seite/Gruppe veröffentlichen"
 
-#: ../../addon/fbpost/fbpost.php:287 ../../addon.old/fbpost/fbpost.php:240
+#: ../../addon/fbpost/fbpost.php:295 ../../addon.old/fbpost/fbpost.php:240
 msgid "Facebook Post Settings"
 msgstr "Facebook-Beitragseinstellungen"
 
-#: ../../addon/widgets/widget_like.php:58
+#: ../../addon/fbpost/fbpost.php:375
+#, php-format
+msgid "%s:"
+msgstr "%s:"
+
+#: ../../addon/widgets/widget_like.php:59
 #: ../../addon.old/widgets/widget_like.php:58
 #, php-format
 msgid "%d person likes this"
@@ -5302,7 +5404,7 @@ msgid_plural "%d people like this"
 msgstr[0] "%d Person mag das"
 msgstr[1] "%d Leute mögen das"
 
-#: ../../addon/widgets/widget_like.php:61
+#: ../../addon/widgets/widget_like.php:62
 #: ../../addon.old/widgets/widget_like.php:61
 #, php-format
 msgid "%d person doesn't like this"
@@ -5315,15 +5417,15 @@ msgstr[1] "%d Leute mögen das nicht"
 msgid "Get added to this list!"
 msgstr "Werde Mitglied dieser Liste"
 
-#: ../../addon/widgets/widgets.php:56 ../../addon.old/widgets/widgets.php:56
+#: ../../addon/widgets/widgets.php:57 ../../addon.old/widgets/widgets.php:56
 msgid "Generate new key"
 msgstr "Neuen Schlüssel erstellen"
 
-#: ../../addon/widgets/widgets.php:59 ../../addon.old/widgets/widgets.php:59
+#: ../../addon/widgets/widgets.php:60 ../../addon.old/widgets/widgets.php:59
 msgid "Widgets key"
 msgstr "Widgets Schlüssel"
 
-#: ../../addon/widgets/widgets.php:61 ../../addon.old/widgets/widgets.php:61
+#: ../../addon/widgets/widgets.php:62 ../../addon.old/widgets/widgets.php:61
 msgid "Widgets available"
 msgstr "Verfügbare Widgets"
 
@@ -5643,11 +5745,8 @@ msgid "Forum Directory"
 msgstr "Foren Verzeichnis"
 
 #: ../../addon/communityhome/communityhome.php:28
-#: ../../addon/communityhome/communityhome.php:34
-#: ../../addon/communityhome/twillingham/communityhome.php:28
-#: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:962
-#: ../../addon.old/communityhome/communityhome.php:28
+#: ../../addon/communityhome/communityhome.php:34 ../../include/nav.php:64
+#: ../../boot.php:984 ../../addon.old/communityhome/communityhome.php:28
 #: ../../addon.old/communityhome/communityhome.php:34
 #: ../../addon.old/communityhome/twillingham/communityhome.php:28
 #: ../../addon.old/communityhome/twillingham/communityhome.php:34
@@ -5655,38 +5754,35 @@ msgid "Login"
 msgstr "Anmeldung"
 
 #: ../../addon/communityhome/communityhome.php:29
-#: ../../addon/communityhome/twillingham/communityhome.php:29
 #: ../../addon.old/communityhome/communityhome.php:29
 #: ../../addon.old/communityhome/twillingham/communityhome.php:29
 msgid "OpenID"
 msgstr "OpenID"
 
-#: ../../addon/communityhome/communityhome.php:38
-#: ../../addon/communityhome/twillingham/communityhome.php:38
+#: ../../addon/communityhome/communityhome.php:39
 #: ../../addon.old/communityhome/communityhome.php:38
 #: ../../addon.old/communityhome/twillingham/communityhome.php:38
 msgid "Latest users"
 msgstr "Letzte Benutzer"
 
-#: ../../addon/communityhome/communityhome.php:81
-#: ../../addon/communityhome/twillingham/communityhome.php:81
+#: ../../addon/communityhome/communityhome.php:84
 #: ../../addon.old/communityhome/communityhome.php:81
 #: ../../addon.old/communityhome/twillingham/communityhome.php:81
 msgid "Most active users"
 msgstr "Aktivste Nutzer"
 
-#: ../../addon/communityhome/communityhome.php:98
+#: ../../addon/communityhome/communityhome.php:102
 #: ../../addon.old/communityhome/communityhome.php:98
 msgid "Latest photos"
 msgstr "Neueste Fotos"
 
-#: ../../addon/communityhome/communityhome.php:134
+#: ../../addon/communityhome/communityhome.php:141
 #: ../../addon.old/communityhome/communityhome.php:133
 msgid "Latest likes"
 msgstr "Neueste Favoriten"
 
-#: ../../addon/communityhome/communityhome.php:156
-#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1440
+#: ../../addon/communityhome/communityhome.php:163
+#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1497
 #: ../../include/conversation.php:117 ../../include/conversation.php:245
 #: ../../addon.old/communityhome/communityhome.php:155
 msgid "event"
@@ -5840,7 +5936,7 @@ msgstr "Tage"
 #: ../../addon/dav/common/wdcal_edit.inc.php:254
 #: ../../addon/dav/common/wdcal_edit.inc.php:270
 #: ../../addon/dav/common/wdcal_edit.inc.php:293
-#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:976
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:231
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:254
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:270
@@ -5851,7 +5947,7 @@ msgstr "Sonntag"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:235
 #: ../../addon/dav/common/wdcal_edit.inc.php:274
-#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:976
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:235
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:274
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:308
@@ -5859,35 +5955,35 @@ msgid "Monday"
 msgstr "Montag"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:238
-#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:976
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:238
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:277
 msgid "Tuesday"
 msgstr "Dienstag"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:241
-#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:976
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:241
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:280
 msgid "Wednesday"
 msgstr "Mittwoch"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:244
-#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:976
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:244
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:283
 msgid "Thursday"
 msgstr "Donnerstag"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:247
-#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:976
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:247
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:286
 msgid "Friday"
 msgstr "Freitag"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:250
-#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:976
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:250
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:289
 msgid "Saturday"
@@ -6504,43 +6600,43 @@ msgstr "Dreamwidth Passwort"
 msgid "Post to dreamwidth by default"
 msgstr "Standardmäßig bei Dreamwidth veröffentlichen"
 
-#: ../../addon/remote_permissions/remote_permissions.php:44
+#: ../../addon/remote_permissions/remote_permissions.php:45
 msgid "Remote Permissions Settings"
 msgstr "Entfernte Privatsphäreneinstellungen"
 
-#: ../../addon/remote_permissions/remote_permissions.php:45
+#: ../../addon/remote_permissions/remote_permissions.php:46
 msgid ""
 "Allow recipients of your private posts to see the other recipients of the "
 "posts"
 msgstr "Erlaube Empfängern von privaten Nachrichten zu sehen wer die anderen Empfänger sind"
 
-#: ../../addon/remote_permissions/remote_permissions.php:57
+#: ../../addon/remote_permissions/remote_permissions.php:58
 msgid "Remote Permissions settings updated."
 msgstr "Entfernte Privatsphäreneinstellungen aktualisiert."
 
-#: ../../addon/remote_permissions/remote_permissions.php:177
+#: ../../addon/remote_permissions/remote_permissions.php:178
 msgid "Visible to"
 msgstr "Sichtbar für"
 
-#: ../../addon/remote_permissions/remote_permissions.php:177
+#: ../../addon/remote_permissions/remote_permissions.php:178
 msgid "may only be a partial list"
 msgstr "könnte nur ein Teil der Liste sein"
 
-#: ../../addon/remote_permissions/remote_permissions.php:196
+#: ../../addon/remote_permissions/remote_permissions.php:197
 #: ../../addon/altpager/altpager.php:99
 msgid "Global"
 msgstr "Global"
 
-#: ../../addon/remote_permissions/remote_permissions.php:196
+#: ../../addon/remote_permissions/remote_permissions.php:197
 msgid "The posts of every user on this server show the post recipients"
 msgstr "Die Beiträge jedes Nutzers dieses Servers werden die Empfänger des Beitrags anzeigen"
 
-#: ../../addon/remote_permissions/remote_permissions.php:197
+#: ../../addon/remote_permissions/remote_permissions.php:198
 #: ../../addon/altpager/altpager.php:100
 msgid "Individual"
 msgstr "Individuell"
 
-#: ../../addon/remote_permissions/remote_permissions.php:197
+#: ../../addon/remote_permissions/remote_permissions.php:198
 msgid "Each user chooses whether his/her posts show the post recipients"
 msgstr "Jede/r Nutzer/in kann wählen ob die Empfänger der Beiträge angezeigt werden sollen oder nicht"
 
@@ -7017,11 +7113,11 @@ msgstr "Mit dem MathJax Addon können mathematische Formeln, die mit LaTeX gesch
 msgid "Use the MathJax renderer"
 msgstr "MathJax verwenden"
 
-#: ../../addon/mathjax/mathjax.php:74 ../../addon.old/mathjax/mathjax.php:74
+#: ../../addon/mathjax/mathjax.php:75 ../../addon.old/mathjax/mathjax.php:74
 msgid "MathJax Base URL"
 msgstr "MathJax Basis-URL"
 
-#: ../../addon/mathjax/mathjax.php:74 ../../addon.old/mathjax/mathjax.php:74
+#: ../../addon/mathjax/mathjax.php:75 ../../addon.old/mathjax/mathjax.php:74
 msgid ""
 "The URL for the javascript file that should be included to use MathJax. Can "
 "be either the MathJax CDN or another installation of MathJax."
@@ -7189,39 +7285,39 @@ msgstr "Kontakt hinzufügen"
 msgid "View Source"
 msgstr "Quelle ansehen"
 
-#: ../../addon/statusnet/statusnet.php:134
+#: ../../addon/statusnet/statusnet.php:138
 #: ../../addon.old/statusnet/statusnet.php:134
 msgid "Post to StatusNet"
 msgstr "Bei StatusNet veröffentlichen"
 
-#: ../../addon/statusnet/statusnet.php:176
+#: ../../addon/statusnet/statusnet.php:180
 #: ../../addon.old/statusnet/statusnet.php:176
 msgid ""
 "Please contact your site administrator.<br />The provided API URL is not "
 "valid."
 msgstr "Bitte kontaktiere den Administrator des Servers.<br />Die angegebene API-URL ist nicht gültig."
 
-#: ../../addon/statusnet/statusnet.php:204
+#: ../../addon/statusnet/statusnet.php:208
 #: ../../addon.old/statusnet/statusnet.php:204
 msgid "We could not contact the StatusNet API with the Path you entered."
 msgstr "Die StatusNet-API konnte mit dem angegebenen Pfad nicht erreicht werden."
 
-#: ../../addon/statusnet/statusnet.php:232
+#: ../../addon/statusnet/statusnet.php:238
 #: ../../addon.old/statusnet/statusnet.php:232
 msgid "StatusNet settings updated."
 msgstr "StatusNet Einstellungen aktualisiert."
 
-#: ../../addon/statusnet/statusnet.php:257
+#: ../../addon/statusnet/statusnet.php:269
 #: ../../addon.old/statusnet/statusnet.php:257
 msgid "StatusNet Posting Settings"
 msgstr "StatusNet-Beitragseinstellungen"
 
-#: ../../addon/statusnet/statusnet.php:271
+#: ../../addon/statusnet/statusnet.php:283
 #: ../../addon.old/statusnet/statusnet.php:271
 msgid "Globally Available StatusNet OAuthKeys"
 msgstr "Verfügbare OAuth Schlüssel für StatusNet"
 
-#: ../../addon/statusnet/statusnet.php:272
+#: ../../addon/statusnet/statusnet.php:284
 #: ../../addon.old/statusnet/statusnet.php:272
 msgid ""
 "There are preconfigured OAuth key pairs for some StatusNet servers "
@@ -7229,12 +7325,12 @@ msgid ""
 "not feel free to connect to any other StatusNet instance (see below)."
 msgstr "Für einige StatusNet Server sind voreingestellte OAuth Schlüsselpaare verfügbar. Solltest du einen dieser Server benutzen, dann verwende bitte diese Schlüssel. Falls nicht, stelle stattdessen eine Verbindung zu irgend einem anderen StatusNet Server her (siehe unten)."
 
-#: ../../addon/statusnet/statusnet.php:280
+#: ../../addon/statusnet/statusnet.php:292
 #: ../../addon.old/statusnet/statusnet.php:280
 msgid "Provide your own OAuth Credentials"
 msgstr "Eigene OAuth Schlüssel eintragen"
 
-#: ../../addon/statusnet/statusnet.php:281
+#: ../../addon/statusnet/statusnet.php:293
 #: ../../addon.old/statusnet/statusnet.php:281
 msgid ""
 "No consumer key pair for StatusNet found. Register your Friendica Account as"
@@ -7244,22 +7340,22 @@ msgid ""
 "Friendica installation at your favorited StatusNet installation."
 msgstr "Kein Consumer-Schlüsselpaar für StatusNet gefunden. Registriere deinen Friendica-Account als Desktop-Client, kopiere das Consumer-Schlüsselpaar hierher und gib die API-URL ein.<br />Bevor du dein eigenes Consumer-Schlüsselpaar registrierst, frage den Administrator dieses Friendica-Servers, ob schon ein Schlüsselpaar für diesen Friendica-Server auf diesem StatusNet-Server existiert."
 
-#: ../../addon/statusnet/statusnet.php:283
+#: ../../addon/statusnet/statusnet.php:295
 #: ../../addon.old/statusnet/statusnet.php:283
 msgid "OAuth Consumer Key"
 msgstr "OAuth Consumer Key"
 
-#: ../../addon/statusnet/statusnet.php:286
+#: ../../addon/statusnet/statusnet.php:298
 #: ../../addon.old/statusnet/statusnet.php:286
 msgid "OAuth Consumer Secret"
 msgstr "OAuth Consumer Secret"
 
-#: ../../addon/statusnet/statusnet.php:289
+#: ../../addon/statusnet/statusnet.php:301
 #: ../../addon.old/statusnet/statusnet.php:289
 msgid "Base API Path (remember the trailing /)"
 msgstr "Basis-URL der StatusNet-API (vergiss den abschließenden / nicht)"
 
-#: ../../addon/statusnet/statusnet.php:310
+#: ../../addon/statusnet/statusnet.php:322
 #: ../../addon.old/statusnet/statusnet.php:310
 msgid ""
 "To connect to your StatusNet account click the button below to get a "
@@ -7268,38 +7364,38 @@ msgid ""
 " to StatusNet."
 msgstr "Um dein Konto mit einem StatusNet-Konto zu verknüpfen, klicke den Button an, um einen Sicherheitscode von StatusNet zu erhalten, und kopiere diesen in das Eingabefeld weiter unten. Es werden ausschließlich deine <strong>öffentlichen</strong> Nachrichten an StatusNet gesendet."
 
-#: ../../addon/statusnet/statusnet.php:311
+#: ../../addon/statusnet/statusnet.php:323
 #: ../../addon.old/statusnet/statusnet.php:311
 msgid "Log in with StatusNet"
 msgstr "Bei StatusNet anmelden"
 
-#: ../../addon/statusnet/statusnet.php:313
+#: ../../addon/statusnet/statusnet.php:325
 #: ../../addon.old/statusnet/statusnet.php:313
 msgid "Copy the security code from StatusNet here"
 msgstr "Kopiere den Sicherheitscode von StatusNet hier hin"
 
-#: ../../addon/statusnet/statusnet.php:319
+#: ../../addon/statusnet/statusnet.php:331
 #: ../../addon.old/statusnet/statusnet.php:319
 msgid "Cancel Connection Process"
 msgstr "Verbindungsprozess abbrechen"
 
-#: ../../addon/statusnet/statusnet.php:321
+#: ../../addon/statusnet/statusnet.php:333
 #: ../../addon.old/statusnet/statusnet.php:321
 msgid "Current StatusNet API is"
 msgstr "Derzeitige StatusNet-API-URL lautet"
 
-#: ../../addon/statusnet/statusnet.php:322
+#: ../../addon/statusnet/statusnet.php:334
 #: ../../addon.old/statusnet/statusnet.php:322
 msgid "Cancel StatusNet Connection"
 msgstr "Verbindung zum StatusNet Server abbrechen"
 
-#: ../../addon/statusnet/statusnet.php:333 ../../addon/twitter/twitter.php:189
+#: ../../addon/statusnet/statusnet.php:345 ../../addon/twitter/twitter.php:200
 #: ../../addon.old/statusnet/statusnet.php:333
 #: ../../addon.old/twitter/twitter.php:189
 msgid "Currently connected to: "
 msgstr "Momentan verbunden mit: "
 
-#: ../../addon/statusnet/statusnet.php:334
+#: ../../addon/statusnet/statusnet.php:346
 #: ../../addon.old/statusnet/statusnet.php:334
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
@@ -7307,7 +7403,7 @@ msgid ""
 "for every posting separately in the posting options when writing the entry."
 msgstr "Wenn aktiviert, können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen StatusNet-Konto veröffentlicht werden. Du kannst das (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen."
 
-#: ../../addon/statusnet/statusnet.php:336
+#: ../../addon/statusnet/statusnet.php:348
 #: ../../addon.old/statusnet/statusnet.php:336
 msgid ""
 "<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
@@ -7316,28 +7412,37 @@ msgid ""
 "informing the visitor that the access to your profile has been restricted."
 msgstr "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an deinen StatusNet-Beitrag angehängt wird, um auf den Originalbeitrag zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde."
 
-#: ../../addon/statusnet/statusnet.php:339
+#: ../../addon/statusnet/statusnet.php:351
 #: ../../addon.old/statusnet/statusnet.php:339
 msgid "Allow posting to StatusNet"
 msgstr "Veröffentlichung bei StatusNet erlauben"
 
-#: ../../addon/statusnet/statusnet.php:342
+#: ../../addon/statusnet/statusnet.php:354
 #: ../../addon.old/statusnet/statusnet.php:342
 msgid "Send public postings to StatusNet by default"
 msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei StatusNet"
 
-#: ../../addon/statusnet/statusnet.php:345
+#: ../../addon/statusnet/statusnet.php:358
+msgid ""
+"Mirror all posts from statusnet that are no replies or repeated messages"
+msgstr "Spiegle alle Beiträge von StatusNet die keine Antworten oder wiederholten Nachrichten sind"
+
+#: ../../addon/statusnet/statusnet.php:362
+msgid "Shortening method that optimizes the post"
+msgstr "Kürzungsverfahren, das den Beitrag optimiert"
+
+#: ../../addon/statusnet/statusnet.php:366
 #: ../../addon.old/statusnet/statusnet.php:345
 msgid "Send linked #-tags and @-names to StatusNet"
 msgstr "Sende verlinkte #-Tags und @-Namen nach StatusNet"
 
-#: ../../addon/statusnet/statusnet.php:350 ../../addon/twitter/twitter.php:206
+#: ../../addon/statusnet/statusnet.php:371 ../../addon/twitter/twitter.php:226
 #: ../../addon.old/statusnet/statusnet.php:350
 #: ../../addon.old/twitter/twitter.php:206
 msgid "Clear OAuth configuration"
 msgstr "OAuth-Konfiguration löschen"
 
-#: ../../addon/statusnet/statusnet.php:692
+#: ../../addon/statusnet/statusnet.php:745
 #: ../../addon.old/statusnet/statusnet.php:568
 msgid "API URL"
 msgstr "API-URL"
@@ -7521,25 +7626,25 @@ msgstr "Link zum Setzen des Opt-Out Cookies anzeigen?"
 msgid "Asynchronous tracking"
 msgstr "Asynchrones Tracken"
 
-#: ../../addon/twitter/twitter.php:73 ../../addon.old/twitter/twitter.php:73
+#: ../../addon/twitter/twitter.php:77 ../../addon.old/twitter/twitter.php:73
 msgid "Post to Twitter"
 msgstr "Bei Twitter veröffentlichen"
 
-#: ../../addon/twitter/twitter.php:122 ../../addon.old/twitter/twitter.php:122
+#: ../../addon/twitter/twitter.php:129 ../../addon.old/twitter/twitter.php:122
 msgid "Twitter settings updated."
 msgstr "Twitter Einstellungen aktualisiert."
 
-#: ../../addon/twitter/twitter.php:146 ../../addon.old/twitter/twitter.php:146
+#: ../../addon/twitter/twitter.php:157 ../../addon.old/twitter/twitter.php:146
 msgid "Twitter Posting Settings"
 msgstr "Twitter-Beitragseinstellungen"
 
-#: ../../addon/twitter/twitter.php:153 ../../addon.old/twitter/twitter.php:153
+#: ../../addon/twitter/twitter.php:164 ../../addon.old/twitter/twitter.php:153
 msgid ""
 "No consumer key pair for Twitter found. Please contact your site "
 "administrator."
 msgstr "Kein Consumer-Schlüsselpaar für Twitter gefunden. Bitte wende dich an den Administrator der Seite."
 
-#: ../../addon/twitter/twitter.php:172 ../../addon.old/twitter/twitter.php:172
+#: ../../addon/twitter/twitter.php:183 ../../addon.old/twitter/twitter.php:172
 msgid ""
 "At this Friendica instance the Twitter plugin was enabled but you have not "
 "yet connected your account to your Twitter account. To do so click the "
@@ -7548,22 +7653,22 @@ msgid ""
 " be posted to Twitter."
 msgstr "Auf diesem Friendica-Server wurde das Twitter-Plugin aktiviert, aber du hast deinen Account noch nicht mit deinem Twitter-Account verbunden. Klicke dazu auf die Schaltfläche unten. Du erhältst dann eine PIN von Twitter, die du dann in das Eingabefeld unten einfügst. Denk daran, den Senden-Knopf zu drücken! Nur <strong>öffentliche</strong> Beiträge werden bei Twitter veröffentlicht."
 
-#: ../../addon/twitter/twitter.php:173 ../../addon.old/twitter/twitter.php:173
+#: ../../addon/twitter/twitter.php:184 ../../addon.old/twitter/twitter.php:173
 msgid "Log in with Twitter"
 msgstr "bei Twitter anmelden"
 
-#: ../../addon/twitter/twitter.php:175 ../../addon.old/twitter/twitter.php:175
+#: ../../addon/twitter/twitter.php:186 ../../addon.old/twitter/twitter.php:175
 msgid "Copy the PIN from Twitter here"
 msgstr "Kopiere die Twitter-PIN hier her"
 
-#: ../../addon/twitter/twitter.php:190 ../../addon.old/twitter/twitter.php:190
+#: ../../addon/twitter/twitter.php:201 ../../addon.old/twitter/twitter.php:190
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated Twitter account. You can choose to do so by default (here) or for"
 " every posting separately in the posting options when writing the entry."
 msgstr "Wenn aktiviert, können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen Twitter-Konto veröffentlicht werden. Du kannst dies (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen."
 
-#: ../../addon/twitter/twitter.php:192 ../../addon.old/twitter/twitter.php:192
+#: ../../addon/twitter/twitter.php:203 ../../addon.old/twitter/twitter.php:192
 msgid ""
 "<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
 "details from unknown viewers?</em>) the link potentially included in public "
@@ -7571,23 +7676,31 @@ msgid ""
 "the visitor that the access to your profile has been restricted."
 msgstr "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an an deinen Twitter-Beitrag angehängt wird, um auf den Originalbeitrag zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde."
 
-#: ../../addon/twitter/twitter.php:195 ../../addon.old/twitter/twitter.php:195
+#: ../../addon/twitter/twitter.php:206 ../../addon.old/twitter/twitter.php:195
 msgid "Allow posting to Twitter"
 msgstr "Veröffentlichung bei Twitter erlauben"
 
-#: ../../addon/twitter/twitter.php:198 ../../addon.old/twitter/twitter.php:198
+#: ../../addon/twitter/twitter.php:209 ../../addon.old/twitter/twitter.php:198
 msgid "Send public postings to Twitter by default"
 msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter"
 
-#: ../../addon/twitter/twitter.php:201 ../../addon.old/twitter/twitter.php:201
+#: ../../addon/twitter/twitter.php:213
+msgid "Mirror all posts from twitter that are no replies or retweets"
+msgstr "Spiegle alle Beiträge von Twitter die keine Antworten oder wiederholten Nachrichten sind"
+
+#: ../../addon/twitter/twitter.php:217
+msgid "Shortening method that optimizes the tweet"
+msgstr "Kürzungsverfahren, das den Tweet optimiert"
+
+#: ../../addon/twitter/twitter.php:221 ../../addon.old/twitter/twitter.php:201
 msgid "Send linked #-tags and @-names to Twitter"
 msgstr "Sende verlinkte #-Tags und @-Namen nach Twitter"
 
-#: ../../addon/twitter/twitter.php:508 ../../addon.old/twitter/twitter.php:396
+#: ../../addon/twitter/twitter.php:556 ../../addon.old/twitter/twitter.php:396
 msgid "Consumer key"
 msgstr "Consumer Key"
 
-#: ../../addon/twitter/twitter.php:509 ../../addon.old/twitter/twitter.php:397
+#: ../../addon/twitter/twitter.php:557 ../../addon.old/twitter/twitter.php:397
 msgid "Consumer secret"
 msgstr "Consumer Secret"
 
@@ -8177,8 +8290,8 @@ msgstr "Untreu"
 msgid "Sex Addict"
 msgstr "Sexbesessen"
 
-#: ../../include/profile_selectors.php:42 ../../include/user.php:278
-#: ../../include/user.php:282
+#: ../../include/profile_selectors.php:42 ../../include/user.php:279
+#: ../../include/user.php:283
 msgid "Friends"
 msgstr "Freunde"
 
@@ -8282,242 +8395,242 @@ msgstr "(kein Betreff)"
 msgid " on Last.fm"
 msgstr " bei Last.fm"
 
-#: ../../include/text.php:243
+#: ../../include/text.php:263
 msgid "prev"
 msgstr "vorige"
 
-#: ../../include/text.php:245
+#: ../../include/text.php:265
 msgid "first"
 msgstr "erste"
 
-#: ../../include/text.php:274
+#: ../../include/text.php:294
 msgid "last"
 msgstr "letzte"
 
-#: ../../include/text.php:277
+#: ../../include/text.php:297
 msgid "next"
 msgstr "nächste"
 
-#: ../../include/text.php:295
+#: ../../include/text.php:315
 msgid "newer"
 msgstr "neuer"
 
-#: ../../include/text.php:299
+#: ../../include/text.php:319
 msgid "older"
 msgstr "älter"
 
-#: ../../include/text.php:604
+#: ../../include/text.php:658
 msgid "No contacts"
 msgstr "Keine Kontakte"
 
-#: ../../include/text.php:613
+#: ../../include/text.php:667
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] "%d Kontakt"
 msgstr[1] "%d Kontakte"
 
-#: ../../include/text.php:726
+#: ../../include/text.php:780
 msgid "poke"
 msgstr "anstupsen"
 
-#: ../../include/text.php:726 ../../include/conversation.php:210
+#: ../../include/text.php:780 ../../include/conversation.php:210
 msgid "poked"
 msgstr "stupste"
 
-#: ../../include/text.php:727
+#: ../../include/text.php:781
 msgid "ping"
 msgstr "anpingen"
 
-#: ../../include/text.php:727
+#: ../../include/text.php:781
 msgid "pinged"
 msgstr "pingte"
 
-#: ../../include/text.php:728
+#: ../../include/text.php:782
 msgid "prod"
 msgstr "knuffen"
 
-#: ../../include/text.php:728
+#: ../../include/text.php:782
 msgid "prodded"
 msgstr "knuffte"
 
-#: ../../include/text.php:729
+#: ../../include/text.php:783
 msgid "slap"
 msgstr "ohrfeigen"
 
-#: ../../include/text.php:729
+#: ../../include/text.php:783
 msgid "slapped"
 msgstr "ohrfeigte"
 
-#: ../../include/text.php:730
+#: ../../include/text.php:784
 msgid "finger"
 msgstr "befummeln"
 
-#: ../../include/text.php:730
+#: ../../include/text.php:784
 msgid "fingered"
 msgstr "befummelte"
 
-#: ../../include/text.php:731
+#: ../../include/text.php:785
 msgid "rebuff"
 msgstr "eine Abfuhr erteilen"
 
-#: ../../include/text.php:731
+#: ../../include/text.php:785
 msgid "rebuffed"
 msgstr "abfuhrerteilte"
 
-#: ../../include/text.php:743
+#: ../../include/text.php:797
 msgid "happy"
 msgstr "glücklich"
 
-#: ../../include/text.php:744
+#: ../../include/text.php:798
 msgid "sad"
 msgstr "traurig"
 
-#: ../../include/text.php:745
+#: ../../include/text.php:799
 msgid "mellow"
 msgstr "sanft"
 
-#: ../../include/text.php:746
+#: ../../include/text.php:800
 msgid "tired"
 msgstr "müde"
 
-#: ../../include/text.php:747
+#: ../../include/text.php:801
 msgid "perky"
 msgstr "frech"
 
-#: ../../include/text.php:748
+#: ../../include/text.php:802
 msgid "angry"
 msgstr "sauer"
 
-#: ../../include/text.php:749
+#: ../../include/text.php:803
 msgid "stupified"
 msgstr "verblüfft"
 
-#: ../../include/text.php:750
+#: ../../include/text.php:804
 msgid "puzzled"
 msgstr "verwirrt"
 
-#: ../../include/text.php:751
+#: ../../include/text.php:805
 msgid "interested"
 msgstr "interessiert"
 
-#: ../../include/text.php:752
+#: ../../include/text.php:806
 msgid "bitter"
 msgstr "verbittert"
 
-#: ../../include/text.php:753
+#: ../../include/text.php:807
 msgid "cheerful"
 msgstr "fröhlich"
 
-#: ../../include/text.php:754
+#: ../../include/text.php:808
 msgid "alive"
 msgstr "lebendig"
 
-#: ../../include/text.php:755
+#: ../../include/text.php:809
 msgid "annoyed"
 msgstr "verärgert"
 
-#: ../../include/text.php:756
+#: ../../include/text.php:810
 msgid "anxious"
 msgstr "unruhig"
 
-#: ../../include/text.php:757
+#: ../../include/text.php:811
 msgid "cranky"
 msgstr "schrullig"
 
-#: ../../include/text.php:758
+#: ../../include/text.php:812
 msgid "disturbed"
 msgstr "verstört"
 
-#: ../../include/text.php:759
+#: ../../include/text.php:813
 msgid "frustrated"
 msgstr "frustriert"
 
-#: ../../include/text.php:760
+#: ../../include/text.php:814
 msgid "motivated"
 msgstr "motiviert"
 
-#: ../../include/text.php:761
+#: ../../include/text.php:815
 msgid "relaxed"
 msgstr "entspannt"
 
-#: ../../include/text.php:762
+#: ../../include/text.php:816
 msgid "surprised"
 msgstr "überrascht"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "January"
 msgstr "Januar"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "February"
 msgstr "Februar"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "March"
 msgstr "März"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "April"
 msgstr "April"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "May"
 msgstr "Mai"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "June"
 msgstr "Juni"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "July"
 msgstr "Juli"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "August"
 msgstr "August"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "September"
 msgstr "September"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "October"
 msgstr "Oktober"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "November"
 msgstr "November"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "December"
 msgstr "Dezember"
 
-#: ../../include/text.php:1010
+#: ../../include/text.php:1067
 msgid "bytes"
 msgstr "Byte"
 
-#: ../../include/text.php:1037 ../../include/text.php:1049
+#: ../../include/text.php:1094 ../../include/text.php:1106
 msgid "Click to open/close"
 msgstr "Zum öffnen/schließen klicken"
 
-#: ../../include/text.php:1222 ../../include/user.php:236
+#: ../../include/text.php:1279 ../../include/user.php:237
 msgid "default"
 msgstr "Standard"
 
-#: ../../include/text.php:1234
+#: ../../include/text.php:1291
 msgid "Select an alternate language"
 msgstr "Alternative Sprache auswählen"
 
-#: ../../include/text.php:1444
+#: ../../include/text.php:1501
 msgid "activity"
 msgstr "Aktivität"
 
-#: ../../include/text.php:1447
+#: ../../include/text.php:1504
 msgid "post"
 msgstr "Beitrag"
 
-#: ../../include/text.php:1602
+#: ../../include/text.php:1659
 msgid "Item filed"
 msgstr "Beitrag abgelegt"
 
@@ -8525,11 +8638,11 @@ msgstr "Beitrag abgelegt"
 msgid "Sharing notification from Diaspora network"
 msgstr "Freigabe-Benachrichtigung von Diaspora"
 
-#: ../../include/diaspora.php:2236
+#: ../../include/diaspora.php:2239
 msgid "Attachments:"
 msgstr "Anhänge:"
 
-#: ../../include/network.php:847
+#: ../../include/network.php:850
 msgid "view full size"
 msgstr "Volle Größe anzeigen"
 
@@ -8612,7 +8725,7 @@ msgstr "Neue Gruppe erstellen"
 msgid "Contacts not in any group"
 msgstr "Kontakte in keiner Gruppe"
 
-#: ../../include/nav.php:46 ../../boot.php:961
+#: ../../include/nav.php:46 ../../boot.php:983
 msgid "Logout"
 msgstr "Abmelden"
 
@@ -8620,7 +8733,7 @@ msgstr "Abmelden"
 msgid "End this session"
 msgstr "Diese Sitzung beenden"
 
-#: ../../include/nav.php:49 ../../boot.php:1737
+#: ../../include/nav.php:49 ../../boot.php:1781
 msgid "Status"
 msgstr "Status"
 
@@ -8712,7 +8825,7 @@ msgstr "Andere Seiten verwalten"
 msgid "Delegations"
 msgstr "Delegierungen"
 
-#: ../../include/nav.php:142 ../../boot.php:1251
+#: ../../include/nav.php:142 ../../boot.php:1286
 msgid "Profiles"
 msgstr "Profile"
 
@@ -8791,17 +8904,17 @@ msgstr "Alles"
 msgid "Categories"
 msgstr "Kategorien"
 
-#: ../../include/auth.php:36
+#: ../../include/auth.php:38
 msgid "Logged out."
 msgstr "Abgemeldet."
 
-#: ../../include/auth.php:126
+#: ../../include/auth.php:128
 msgid ""
 "We encountered a problem while logging in with the OpenID you provided. "
 "Please check the correct spelling of the ID."
 msgstr "Beim Versuch dich mit der von dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe, dass du die OpenID richtig geschrieben hast."
 
-#: ../../include/auth.php:126
+#: ../../include/auth.php:128
 msgid "The error message was:"
 msgstr "Die Fehlermeldung lautete:"
 
@@ -8862,36 +8975,32 @@ msgstr "Sekunden"
 msgid "%1$d %2$s ago"
 msgstr "%1$d %2$s her"
 
-#: ../../include/datetime.php:472 ../../include/items.php:1695
+#: ../../include/datetime.php:472 ../../include/items.php:1705
 #, php-format
 msgid "%s's birthday"
 msgstr "%ss Geburtstag"
 
-#: ../../include/datetime.php:473 ../../include/items.php:1696
+#: ../../include/datetime.php:473 ../../include/items.php:1706
 #, php-format
 msgid "Happy Birthday %s"
 msgstr "Herzlichen Glückwunsch %s"
 
-#: ../../include/onepoll.php:439
-msgid "From: "
-msgstr "Von: "
-
-#: ../../include/bbcode.php:202 ../../include/bbcode.php:482
+#: ../../include/bbcode.php:210 ../../include/bbcode.php:505
 msgid "Image/photo"
 msgstr "Bild/Foto"
 
-#: ../../include/bbcode.php:254
+#: ../../include/bbcode.php:262
 #, php-format
 msgid ""
-"<span><a href=\"%s\">%s</a> wrote the following <a "
-"href=\"%s\">post</a>:</span>"
-msgstr "<span><a href=\"%s\">%s</a> schrieb den folgenden <a href=\"%s\">Beitrag</a>:</span>"
+"<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a "
+"href=\"%s\" target=\"external-link\">post</a>:</span>"
+msgstr "<span><a href=\"%s\" target=\"external-link\">%s</a> schrieb den folgenden <a href=\"%s\" target=\"external-link\">Eintrag</a>:</span>"
 
-#: ../../include/bbcode.php:447 ../../include/bbcode.php:467
+#: ../../include/bbcode.php:470 ../../include/bbcode.php:490
 msgid "$1 wrote:"
 msgstr "$1 hat geschrieben:"
 
-#: ../../include/bbcode.php:487 ../../include/bbcode.php:488
+#: ../../include/bbcode.php:510 ../../include/bbcode.php:511
 msgid "Encrypted content"
 msgstr "Verschlüsselter Inhalt"
 
@@ -9297,83 +9406,83 @@ msgstr "Konnte die Kontaktinformationen nicht empfangen."
 msgid "following"
 msgstr "folgen"
 
-#: ../../include/items.php:3363
+#: ../../include/items.php:3380
 msgid "A new person is sharing with you at "
 msgstr "Eine neue Person teilt mit dir auf "
 
-#: ../../include/items.php:3363
+#: ../../include/items.php:3380
 msgid "You have a new follower at "
 msgstr "Du hast einen neuen Kontakt auf "
 
-#: ../../include/items.php:4047
+#: ../../include/items.php:4064
 msgid "Archives"
 msgstr "Archiv"
 
-#: ../../include/user.php:38
+#: ../../include/user.php:39
 msgid "An invitation is required."
 msgstr "Du benötigst eine Einladung."
 
-#: ../../include/user.php:43
+#: ../../include/user.php:44
 msgid "Invitation could not be verified."
 msgstr "Die Einladung konnte nicht überprüft werden."
 
-#: ../../include/user.php:51
+#: ../../include/user.php:52
 msgid "Invalid OpenID url"
 msgstr "Ungültige OpenID URL"
 
-#: ../../include/user.php:66
+#: ../../include/user.php:67
 msgid "Please enter the required information."
 msgstr "Bitte trage die erforderlichen Informationen ein."
 
-#: ../../include/user.php:80
+#: ../../include/user.php:81
 msgid "Please use a shorter name."
 msgstr "Bitte verwende einen kürzeren Namen."
 
-#: ../../include/user.php:82
+#: ../../include/user.php:83
 msgid "Name too short."
 msgstr "Der Name ist zu kurz."
 
-#: ../../include/user.php:97
+#: ../../include/user.php:98
 msgid "That doesn't appear to be your full (First Last) name."
 msgstr "Das scheint nicht dein kompletter Name (Vor- und Nachname) zu sein."
 
-#: ../../include/user.php:102
+#: ../../include/user.php:103
 msgid "Your email domain is not among those allowed on this site."
 msgstr "Die Domain deiner E-Mail Adresse ist auf dieser Seite nicht erlaubt."
 
-#: ../../include/user.php:105
+#: ../../include/user.php:106
 msgid "Not a valid email address."
 msgstr "Keine gültige E-Mail-Adresse."
 
-#: ../../include/user.php:115
+#: ../../include/user.php:116
 msgid "Cannot use that email."
 msgstr "Konnte diese E-Mail-Adresse nicht verwenden."
 
-#: ../../include/user.php:121
+#: ../../include/user.php:122
 msgid ""
 "Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
 "must also begin with a letter."
 msgstr "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\", \"_\" und \"-\") bestehen, außerdem muss er mit einem Buchstaben beginnen."
 
-#: ../../include/user.php:127 ../../include/user.php:225
+#: ../../include/user.php:128 ../../include/user.php:226
 msgid "Nickname is already registered. Please choose another."
 msgstr "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen."
 
-#: ../../include/user.php:137
+#: ../../include/user.php:138
 msgid ""
 "Nickname was once registered here and may not be re-used. Please choose "
 "another."
 msgstr "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen."
 
-#: ../../include/user.php:153
+#: ../../include/user.php:154
 msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden."
 
-#: ../../include/user.php:211
+#: ../../include/user.php:212
 msgid "An error occurred during registration. Please try again."
 msgstr "Während der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal."
 
-#: ../../include/user.php:246
+#: ../../include/user.php:247
 msgid "An error occurred creating your default profile. Please try again."
 msgstr "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal."
 
@@ -9399,34 +9508,34 @@ msgstr "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das
 msgid "stopped following"
 msgstr "wird nicht mehr gefolgt"
 
-#: ../../include/Contact.php:225 ../../include/conversation.php:795
+#: ../../include/Contact.php:225 ../../include/conversation.php:816
 msgid "Poke"
 msgstr "Anstupsen"
 
-#: ../../include/Contact.php:226 ../../include/conversation.php:789
+#: ../../include/Contact.php:226 ../../include/conversation.php:810
 msgid "View Status"
 msgstr "Pinnwand anschauen"
 
-#: ../../include/Contact.php:227 ../../include/conversation.php:790
+#: ../../include/Contact.php:227 ../../include/conversation.php:811
 msgid "View Profile"
 msgstr "Profil anschauen"
 
-#: ../../include/Contact.php:228 ../../include/conversation.php:791
+#: ../../include/Contact.php:228 ../../include/conversation.php:812
 msgid "View Photos"
 msgstr "Bilder anschauen"
 
 #: ../../include/Contact.php:229 ../../include/Contact.php:242
-#: ../../include/conversation.php:792
+#: ../../include/conversation.php:813
 msgid "Network Posts"
 msgstr "Netzwerkbeiträge"
 
 #: ../../include/Contact.php:230 ../../include/Contact.php:242
-#: ../../include/conversation.php:793
+#: ../../include/conversation.php:814
 msgid "Edit Contact"
 msgstr "Kontakt bearbeiten"
 
 #: ../../include/Contact.php:231 ../../include/Contact.php:242
-#: ../../include/conversation.php:794
+#: ../../include/conversation.php:815
 msgid "Send PM"
 msgstr "Private Nachricht senden"
 
@@ -9444,90 +9553,92 @@ msgstr "Nachricht/Beitrag"
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr "%1$s hat %2$s\\s %3$s als Favorit markiert"
 
-#: ../../include/conversation.php:599 ../../object/Item.php:226
+#: ../../include/conversation.php:620 ../../object/Item.php:248
 msgid "Categories:"
 msgstr "Kategorien"
 
-#: ../../include/conversation.php:600 ../../object/Item.php:227
+#: ../../include/conversation.php:621 ../../object/Item.php:249
 msgid "Filed under:"
 msgstr "Abgelegt unter:"
 
-#: ../../include/conversation.php:685
+#: ../../include/conversation.php:706
 msgid "remove"
 msgstr "löschen"
 
-#: ../../include/conversation.php:689
+#: ../../include/conversation.php:710
 msgid "Delete Selected Items"
 msgstr "Lösche die markierten Beiträge"
 
-#: ../../include/conversation.php:788
+#: ../../include/conversation.php:809
 msgid "Follow Thread"
 msgstr "Folge der Unterhaltung"
 
-#: ../../include/conversation.php:857
+#: ../../include/conversation.php:878
 #, php-format
 msgid "%s likes this."
 msgstr "%s mag das."
 
-#: ../../include/conversation.php:857
+#: ../../include/conversation.php:878
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s mag das nicht."
 
-#: ../../include/conversation.php:861
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this."
-msgstr "<span  %1$s>%2$d Leute</span> mögen das."
+#: ../../include/conversation.php:884
+msgid "like this"
+msgstr "mögen dies"
 
-#: ../../include/conversation.php:863
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this."
-msgstr "<span  %1$s>%2$d Leute</span> mögen das nicht."
+#: ../../include/conversation.php:888
+msgid "don't like this"
+msgstr "mögen dies nicht"
 
-#: ../../include/conversation.php:869
+#: ../../include/conversation.php:895
+msgid "people"
+msgstr "Leute"
+
+#: ../../include/conversation.php:905
 msgid "and"
 msgstr "und"
 
-#: ../../include/conversation.php:875
+#: ../../include/conversation.php:911
 #, php-format
 msgid ", and %d other people"
 msgstr " und %d andere"
 
-#: ../../include/conversation.php:877
+#: ../../include/conversation.php:913
 #, php-format
 msgid "%s like this."
 msgstr "%s mögen das."
 
-#: ../../include/conversation.php:877
+#: ../../include/conversation.php:913
 #, php-format
 msgid "%s don't like this."
 msgstr "%s mögen das nicht."
 
-#: ../../include/conversation.php:904 ../../include/conversation.php:922
+#: ../../include/conversation.php:940 ../../include/conversation.php:958
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Für <strong>jedermann</strong> sichtbar"
 
-#: ../../include/conversation.php:906 ../../include/conversation.php:924
+#: ../../include/conversation.php:942 ../../include/conversation.php:960
 msgid "Please enter a video link/URL:"
 msgstr "Bitte Link/URL zum Video einfügen:"
 
-#: ../../include/conversation.php:907 ../../include/conversation.php:925
+#: ../../include/conversation.php:943 ../../include/conversation.php:961
 msgid "Please enter an audio link/URL:"
 msgstr "Bitte Link/URL zum Audio einfügen:"
 
-#: ../../include/conversation.php:908 ../../include/conversation.php:926
+#: ../../include/conversation.php:944 ../../include/conversation.php:962
 msgid "Tag term:"
 msgstr "Tag:"
 
-#: ../../include/conversation.php:910 ../../include/conversation.php:928
+#: ../../include/conversation.php:946 ../../include/conversation.php:964
 msgid "Where are you right now?"
 msgstr "Wo hältst du dich jetzt gerade auf?"
 
-#: ../../include/conversation.php:911
+#: ../../include/conversation.php:947
 msgid "Delete item(s)?"
 msgstr "Einträge löschen?"
 
-#: ../../include/conversation.php:990
+#: ../../include/conversation.php:1026
 msgid "permissions"
 msgstr "Zugriffsrechte"
 
@@ -9543,117 +9654,133 @@ msgstr "Diese Aktion überschreitet die Obergrenze deines Abonnements."
 msgid "This action is not available under your subscription plan."
 msgstr "Diese Aktion ist in deinem Abonnement nicht verfügbar."
 
-#: ../../boot.php:620
+#: ../../boot.php:634
 msgid "Delete this item?"
 msgstr "Diesen Beitrag löschen?"
 
-#: ../../boot.php:623
+#: ../../boot.php:637
 msgid "show fewer"
 msgstr "weniger anzeigen"
 
-#: ../../boot.php:832
+#: ../../boot.php:851
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen."
 
-#: ../../boot.php:834
+#: ../../boot.php:856
 #, php-format
 msgid "Update Error at %s"
 msgstr "Updatefehler bei %s"
 
-#: ../../boot.php:935
+#: ../../boot.php:958
 msgid "Create a New Account"
 msgstr "Neues Konto erstellen"
 
-#: ../../boot.php:964
+#: ../../boot.php:986
 msgid "Nickname or Email address: "
 msgstr "Spitzname oder E-Mail-Adresse: "
 
-#: ../../boot.php:965
+#: ../../boot.php:987
 msgid "Password: "
 msgstr "Passwort: "
 
-#: ../../boot.php:966
+#: ../../boot.php:988
 msgid "Remember me"
 msgstr "Anmeldedaten merken"
 
-#: ../../boot.php:969
+#: ../../boot.php:991
 msgid "Or login using OpenID: "
 msgstr "Oder melde dich mit deiner OpenID an: "
 
-#: ../../boot.php:975
+#: ../../boot.php:997
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: ../../boot.php:1100
+#: ../../boot.php:1000
+msgid "Website Terms of Service"
+msgstr "Website Nutzungsbedingungen"
+
+#: ../../boot.php:1001
+msgid "terms of service"
+msgstr "Nutzungsbedingungen"
+
+#: ../../boot.php:1003
+msgid "Website Privacy Policy"
+msgstr "Website Datenschutzerklärung"
+
+#: ../../boot.php:1004
+msgid "privacy policy"
+msgstr "Datenschutzerklärung"
+
+#: ../../boot.php:1133
 msgid "Requested account is not available."
 msgstr "Das angefragte Profil ist nicht vorhanden."
 
-#: ../../boot.php:1177
+#: ../../boot.php:1212
 msgid "Edit profile"
 msgstr "Profil bearbeiten"
 
-#: ../../boot.php:1243
+#: ../../boot.php:1278
 msgid "Message"
 msgstr "Nachricht"
 
-#: ../../boot.php:1251
+#: ../../boot.php:1286
 msgid "Manage/edit profiles"
 msgstr "Profile verwalten/editieren"
 
-#: ../../boot.php:1365 ../../boot.php:1451
+#: ../../boot.php:1409 ../../boot.php:1495
 msgid "g A l F d"
 msgstr "l, d. F G \\U\\h\\r"
 
-#: ../../boot.php:1366 ../../boot.php:1452
+#: ../../boot.php:1410 ../../boot.php:1496
 msgid "F d"
 msgstr "d. F"
 
-#: ../../boot.php:1411 ../../boot.php:1492
+#: ../../boot.php:1455 ../../boot.php:1536
 msgid "[today]"
 msgstr "[heute]"
 
-#: ../../boot.php:1423
+#: ../../boot.php:1467
 msgid "Birthday Reminders"
 msgstr "Geburtstagserinnerungen"
 
-#: ../../boot.php:1424
+#: ../../boot.php:1468
 msgid "Birthdays this week:"
 msgstr "Geburtstage diese Woche:"
 
-#: ../../boot.php:1485
+#: ../../boot.php:1529
 msgid "[No description]"
 msgstr "[keine Beschreibung]"
 
-#: ../../boot.php:1503
+#: ../../boot.php:1547
 msgid "Event Reminders"
 msgstr "Veranstaltungserinnerungen"
 
-#: ../../boot.php:1504
+#: ../../boot.php:1548
 msgid "Events this week:"
 msgstr "Veranstaltungen diese Woche"
 
-#: ../../boot.php:1740
+#: ../../boot.php:1784
 msgid "Status Messages and Posts"
 msgstr "Statusnachrichten und Beiträge"
 
-#: ../../boot.php:1747
+#: ../../boot.php:1791
 msgid "Profile Details"
 msgstr "Profildetails"
 
-#: ../../boot.php:1764
+#: ../../boot.php:1808
 msgid "Events and Calendar"
 msgstr "Ereignisse und Kalender"
 
-#: ../../boot.php:1771
+#: ../../boot.php:1815
 msgid "Only You Can See This"
 msgstr "Nur du kannst das sehen"
 
-#: ../../object/Item.php:238
+#: ../../object/Item.php:260
 msgid "via"
 msgstr "via"
 
-#: ../../index.php:398
+#: ../../index.php:392
 msgid "toggle mobile"
 msgstr "auf/von Mobile Ansicht wechseln"
 
diff --git a/view/de/request_notify_eml.tpl b/view/de/request_notify_eml.tpl
index 057044e8c9..16a4f7abe5 100644
--- a/view/de/request_notify_eml.tpl
+++ b/view/de/request_notify_eml.tpl
@@ -7,7 +7,7 @@ erhalten.
 
 Du kannst sein/ihr Profil unter $[url] finden.
 
-Bitte melde dich an um die komplette Vorstellung einzusehen 
+Bitte melde dich an um die komplette Anfrage einzusehen 
 und die Anfrage zu bestätigen oder zu ignorieren oder abzulehnen.
 
 $[siteurl]
diff --git a/view/de/smarty3/cmnt_received_eml.tpl b/view/de/smarty3/cmnt_received_eml.tpl
index f902d96b4e..9b5c3d842b 100644
--- a/view/de/smarty3/cmnt_received_eml.tpl
+++ b/view/de/smarty3/cmnt_received_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Hallo {{$username}},
 
diff --git a/view/de/smarty3/cmnt_received_html_body_eml.tpl b/view/de/smarty3/cmnt_received_html_body_eml.tpl
index b4b994c640..c219fcb18c 100644
--- a/view/de/smarty3/cmnt_received_html_body_eml.tpl
+++ b/view/de/smarty3/cmnt_received_html_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
diff --git a/view/de/smarty3/cmnt_received_text_body_eml.tpl b/view/de/smarty3/cmnt_received_text_body_eml.tpl
index 19f81a5e3a..d100040c02 100644
--- a/view/de/smarty3/cmnt_received_text_body_eml.tpl
+++ b/view/de/smarty3/cmnt_received_text_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Hallo {{$username}},
 
 '{{$from}}' hat einen Pinnwandeintrag kommentiert dem du auch folgst.
diff --git a/view/de/smarty3/follow_notify_eml.tpl b/view/de/smarty3/follow_notify_eml.tpl
index 2fd04bb658..7bec4d32dd 100644
--- a/view/de/smarty3/follow_notify_eml.tpl
+++ b/view/de/smarty3/follow_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Hallo {{$myname}},
 
diff --git a/view/de/smarty3/friend_complete_eml.tpl b/view/de/smarty3/friend_complete_eml.tpl
index 72234dc67b..592bf7dd85 100644
--- a/view/de/smarty3/friend_complete_eml.tpl
+++ b/view/de/smarty3/friend_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Hallo {{$username}},
 
diff --git a/view/de/smarty3/htconfig.tpl b/view/de/smarty3/htconfig.tpl
index 75d6a77e89..033e481940 100644
--- a/view/de/smarty3/htconfig.tpl
+++ b/view/de/smarty3/htconfig.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?php
 
 // Set the following for your MySQL installation
diff --git a/view/de/smarty3/intro_complete_eml.tpl b/view/de/smarty3/intro_complete_eml.tpl
index f5eaef66b5..45912d746e 100644
--- a/view/de/smarty3/intro_complete_eml.tpl
+++ b/view/de/smarty3/intro_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Hallo {{$username}},
 
diff --git a/view/de/smarty3/lostpass_eml.tpl b/view/de/smarty3/lostpass_eml.tpl
index a507afbda4..4cc5203ed3 100644
--- a/view/de/smarty3/lostpass_eml.tpl
+++ b/view/de/smarty3/lostpass_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Hallo {{$username}},
 	Auf {{$sitename}} wurde eine Anfrage zum Zurücksetzen deines 
diff --git a/view/de/smarty3/mail_received_html_body_eml.tpl b/view/de/smarty3/mail_received_html_body_eml.tpl
index a769686103..b4de64bdbb 100644
--- a/view/de/smarty3/mail_received_html_body_eml.tpl
+++ b/view/de/smarty3/mail_received_html_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
diff --git a/view/de/smarty3/mail_received_text_body_eml.tpl b/view/de/smarty3/mail_received_text_body_eml.tpl
index 7daa6fbf90..2004cc3b0c 100644
--- a/view/de/smarty3/mail_received_text_body_eml.tpl
+++ b/view/de/smarty3/mail_received_text_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Du hast eine neue private Nachricht von '{{$from}}' auf '{{$siteName}}' erhhalten.
 	
 {{$title}}
diff --git a/view/de/smarty3/passchanged_eml.tpl b/view/de/smarty3/passchanged_eml.tpl
index eb08c20b7e..4fd97881f5 100644
--- a/view/de/smarty3/passchanged_eml.tpl
+++ b/view/de/smarty3/passchanged_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Hallo {{$username}},
 	Dein Passwort wurde wie gewünscht geändert. Bitte bewahre diese 
diff --git a/view/de/smarty3/register_open_eml.tpl b/view/de/smarty3/register_open_eml.tpl
index af0a0b9bb4..9e474ce9e0 100644
--- a/view/de/smarty3/register_open_eml.tpl
+++ b/view/de/smarty3/register_open_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Hallo {{$username}},
 	Danke für deine Anmeldung auf {{$sitename}}. Dein Account wurde angelegt. 
diff --git a/view/de/smarty3/register_verify_eml.tpl b/view/de/smarty3/register_verify_eml.tpl
index 78d4aa6b72..c7acbd9b63 100644
--- a/view/de/smarty3/register_verify_eml.tpl
+++ b/view/de/smarty3/register_verify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Eine Neuanmeldung auf {{$sitename}} benötigt 
 deine Aufmerksamkeit. 
diff --git a/view/de/smarty3/request_notify_eml.tpl b/view/de/smarty3/request_notify_eml.tpl
index de2182e9db..d7c49b028b 100644
--- a/view/de/smarty3/request_notify_eml.tpl
+++ b/view/de/smarty3/request_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Hallo {{$myname}},
 
@@ -7,7 +12,7 @@ erhalten.
 
 Du kannst sein/ihr Profil unter {{$url}} finden.
 
-Bitte melde dich an um die komplette Vorstellung einzusehen 
+Bitte melde dich an um die komplette Anfrage einzusehen 
 und die Anfrage zu bestätigen oder zu ignorieren oder abzulehnen.
 
 {{$siteurl}}
diff --git a/view/de/smarty3/update_fail_eml.tpl b/view/de/smarty3/update_fail_eml.tpl
index 5b614709a7..4329d0e42a 100644
--- a/view/de/smarty3/update_fail_eml.tpl
+++ b/view/de/smarty3/update_fail_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Hi, 
 ich bin {{$sitename}}.   
 Die friendica Entwickler haben jüngst Update {{$update}} veröffentlicht, 
diff --git a/view/de/smarty3/wall_received_eml.tpl b/view/de/smarty3/wall_received_eml.tpl
index e90d67261f..2ace0d5f45 100644
--- a/view/de/smarty3/wall_received_eml.tpl
+++ b/view/de/smarty3/wall_received_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Hallo {{$username}},
 
diff --git a/view/de/smarty3/wall_received_html_body_eml.tpl b/view/de/smarty3/wall_received_html_body_eml.tpl
index e6e7f27073..c58ee7500e 100644
--- a/view/de/smarty3/wall_received_html_body_eml.tpl
+++ b/view/de/smarty3/wall_received_html_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
diff --git a/view/de/smarty3/wall_received_text_body_eml.tpl b/view/de/smarty3/wall_received_text_body_eml.tpl
index f53dc6c9c3..eb310177da 100644
--- a/view/de/smarty3/wall_received_text_body_eml.tpl
+++ b/view/de/smarty3/wall_received_text_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Hallo {{$username}},
 
diff --git a/view/de/strings.php b/view/de/strings.php
index ae06508fea..03886e26dd 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -257,6 +257,11 @@ $a->strings["This is most often a permission setting, as the web server may not
 $a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder."] = "Nachdem du alles ausgefüllt hast, erhältst du einen Text, den du in eine Datei namens .htconfig.php in deinem Friendica-Wurzelverzeichnis kopieren musst.";
 $a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Alternativ kannst du diesen Schritt aber auch überspringen und die Installation manuell durchführen. Eine Anleitung dazu (Englisch) findest du in der Datei INSTALL.txt.";
 $a->strings[".htconfig.php is writable"] = "Schreibrechte auf .htconfig.php";
+$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica nutzt die Smarty3 Template Engine um die Webansichten zu rendern. Smarty3 kompiliert Templates zu PHP um das Rendern zu beschleunigen.";
+$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "Um diese kompilierten Templates zu speichern benötigt der Webserver Schreibrechte zum Verzeichnis view/smarty3/ im obersten Ordner von Friendica.";
+$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Bitte stelle sicher, dass der Nutzer unter dem der Webserver läuft (z.B. www-data) Schreibrechte zu diesem Verzeichnis hat.";
+$a->strings["Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains."] = "Hinweis: aus Sicherheitsgründen solltest du dem Webserver nur Schreibrechte für view/smarty3/ geben -- Nicht den Templatedateien (.tpl) die sie enthalten.";
+$a->strings["view/smarty3 is writable"] = "view/smarty3 ist schreibbar";
 $a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "Umschreiben der URLs in der .htaccess funktioniert nicht. Überprüfe die Konfiguration des Servers.";
 $a->strings["Url rewrite is working"] = "URL rewrite funktioniert";
 $a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Die Konfigurationsdatei \".htconfig.php\" konnte nicht angelegt werden. Bitte verwende den angefügten Text, um die Datei im Stammverzeichnis deiner Friendica-Installation zu erzeugen.";
@@ -440,7 +445,6 @@ $a->strings["Find"] = "Finde";
 $a->strings["No valid account found."] = "Kein gültiges Konto gefunden.";
 $a->strings["Password reset request issued. Check your email."] = "Zurücksetzen des Passworts eingeleitet. Bitte überprüfe deine E-Mail.";
 $a->strings["Password reset requested at %s"] = "Anfrage zum Zurücksetzen des Passworts auf %s erhalten";
-$a->strings["Administrator"] = "Administrator";
 $a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Anfrage konnte nicht verifiziert werden. (Eventuell hast du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert.";
 $a->strings["Password Reset"] = "Passwort zurücksetzen";
 $a->strings["Your password has been reset as requested."] = "Dein Passwort wurde wie gewünscht zurückgesetzt.";
@@ -448,6 +452,7 @@ $a->strings["Your new password is"] = "Dein neues Passwort lautet";
 $a->strings["Save or copy your new password - and then"] = "Speichere oder kopiere dein neues Passwort - und dann";
 $a->strings["click here to login"] = "hier klicken, um dich anzumelden";
 $a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Du kannst das Passwort in den <em>Einstellungen</em> ändern, sobald du dich erfolgreich angemeldet hast.";
+$a->strings["Your password has been changed at %s"] = "Auf %s wurde dein Passwort geändert";
 $a->strings["Forgot your Password?"] = "Hast du dein Passwort vergessen?";
 $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib deine E-Mail-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesendet.";
 $a->strings["Nickname or Email: "] = "Spitzname oder E-Mail:";
@@ -610,7 +615,9 @@ $a->strings["Save"] = "Speichern";
 $a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal.";
 $a->strings["Import"] = "Import";
 $a->strings["Move account"] = "Account umziehen";
-$a->strings["You can import an account from another Friendica server. <br>\r\n                            You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here.<br>\r\n                            <b>This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from diaspora"] = "Du kannst deinen Account auf einen anderen Friendica Server umziehen.<br>Dazu musst du deinen Account von deinem alten Server exportieren und hier hochladen. Wir werden dann deinen alten Account, mit allen Kontakten, hier wieder herstellen. Außerdem werden wir deine Kontakte darüber informieren, dass du hierher umgezogen bist.<br><b>Dieses Feature ist experimentell. Kontakte aus dem OStatus Netzwerk (StatusNet/identi.ca) oder von Diaspora können nicht mit umgezogen werden.</b>";
+$a->strings["You can import an account from another Friendica server."] = "Du kannst einen Account von einem anderen Friendica Server importieren.";
+$a->strings["You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."] = "Du musst deinen Account vom alten Server exportieren und hier hochladen. Wir stellen deinen alten Account mit all deinen Kontakten wieder her. Wir werden auch versuchen all deine Freunde darüber zu informieren, dass du hierher umgezogen bist.";
+$a->strings["This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from Diaspora"] = "Dieses Feature ist experimentell. Wir können keine Kontakte vom OStatus Netzwerk (statusnet/identi.ca) oder von Diaspora importieren";
 $a->strings["Account file"] = "Account Datei";
 $a->strings["To export your accont, go to \"Settings->Export your porsonal data\" and select \"Export account\""] = "Um deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche Daten exportieren\" auf und wähle \"Account exportieren\"";
 $a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Maximale Anzahl der täglichen Pinnwand Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen.";
@@ -794,6 +801,7 @@ $a->strings["Self-signed certificate, use SSL for local links only (discouraged)
 $a->strings["File upload"] = "Datei hochladen";
 $a->strings["Policies"] = "Regeln";
 $a->strings["Advanced"] = "Erweitert";
+$a->strings["Performance"] = "Performance";
 $a->strings["Site name"] = "Seitenname";
 $a->strings["Banner/Logo"] = "Banner/Logo";
 $a->strings["System language"] = "Systemsprache";
@@ -803,6 +811,8 @@ $a->strings["Mobile system theme"] = "Systemweites mobiles Thema";
 $a->strings["Theme for mobile devices"] = "Thema für mobile Geräte";
 $a->strings["SSL link policy"] = "Regeln für SSL Links";
 $a->strings["Determines whether generated links should be forced to use SSL"] = "Bestimmt, ob generierte Links SSL verwenden müssen";
+$a->strings["'Share' element"] = "'Teilen' Element";
+$a->strings["Activates the bbcode element 'share' for repeating items."] = "Aktiviert das bbcode Element 'Teilen' um Einträge zu wiederholen.";
 $a->strings["Maximum image size"] = "Maximale Größe von Bildern";
 $a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maximale Upload-Größe von Bildern in Bytes. Standard ist 0, d.h. ohne Limit.";
 $a->strings["Maximum image length"] = "Maximale Länge von Bildern";
@@ -858,6 +868,14 @@ $a->strings["Poll interval"] = "Abfrageintervall";
 $a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Verzögere Hintergrundprozesse, um diese Anzahl an Sekunden um die Systemlast zu reduzieren. Bei 0 Sekunden wird das Auslieferungsintervall verwendet.";
 $a->strings["Maximum Load Average"] = "Maximum Load Average";
 $a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Maximale Systemlast bevor Verteil- und Empfangsprozesse verschoben werden - Standard 50";
+$a->strings["Use MySQL full text engine"] = "Nutze MySQL full text engine";
+$a->strings["Activates the full text engine. Speeds up search - but can only search for four and more characters."] = "Aktiviert die 'full text engine'. Beschleunigt die Suche - aber es kann nur nach vier oder mehr Zeichen gesucht werden.";
+$a->strings["Path to item cache"] = "Pfad zum Eintrag Cache";
+$a->strings["Cache duration in seconds"] = "Cache-Dauer in Sekunden";
+$a->strings["How long should the cache files be hold? Default value is 86400 seconds (One day)."] = "Wie lange sollen die Dateien im Cache vorgehalten werden? Standardwert ist 86400 Sekunden (ein Tag).";
+$a->strings["Path for lock file"] = "Pfad für die Sperrdatei";
+$a->strings["Temp path"] = "Temp Pfad";
+$a->strings["Base path to installation"] = "Basis-Pfad zur Installation";
 $a->strings["Update has been marked successful"] = "Update wurde als erfolgreich markiert";
 $a->strings["Executing %s failed. Check system logs."] = "Ausführung von %s schlug fehl. Systemprotokolle prüfen.";
 $a->strings["Update %s was successfully applied."] = "Update %s war erfolgreich.";
@@ -941,6 +959,10 @@ $a->strings["Applications"] = "Anwendungen";
 $a->strings["No installed applications."] = "Keine Applikationen installiert.";
 $a->strings["Search"] = "Suche";
 $a->strings["Profile not found."] = "Profil nicht gefunden.";
+$a->strings["Profile deleted."] = "Profil gelöscht.";
+$a->strings["Profile-"] = "Profil-";
+$a->strings["New profile created."] = "Neues Profil angelegt.";
+$a->strings["Profile unavailable to clone."] = "Profil nicht zum Duplizieren verfügbar.";
 $a->strings["Profile Name is required."] = "Profilname ist erforderlich.";
 $a->strings["Marital Status"] = "Familienstand";
 $a->strings["Romantic Partner"] = "Romanze";
@@ -961,10 +983,6 @@ $a->strings["public profile"] = "öffentliches Profil";
 $a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s hat %2\$s geändert auf &ldquo;%3\$s&rdquo;";
 $a->strings[" - Visit %1\$s's %2\$s"] = " – %1\$ss %2\$s besuchen";
 $a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat folgendes aktualisiert %2\$s, verändert wurde %3\$s.";
-$a->strings["Profile deleted."] = "Profil gelöscht.";
-$a->strings["Profile-"] = "Profil-";
-$a->strings["New profile created."] = "Neues Profil angelegt.";
-$a->strings["Profile unavailable to clone."] = "Profil nicht zum Duplizieren verfügbar.";
 $a->strings["Hide your contact/friend list from viewers of this profile?"] = "Liste der Kontakte vor Betrachtern dieses Profils verbergen?";
 $a->strings["Edit Profile Details"] = "Profil bearbeiten";
 $a->strings["Change Profile Photo"] = "Profilbild ändern";
@@ -1110,6 +1128,7 @@ $a->strings["Do not import your Facebook profile wall conversations"] = "Faceboo
 $a->strings["If you choose to link conversations and leave both of these boxes unchecked, your Facebook profile wall will be merged with your profile wall on this website and your privacy settings on this website will be used to determine who may see the conversations."] = "Wenn du Facebook-Konversationen importierst und diese beiden Häkchen nicht setzt, wird deine Facebook-Pinnwand mit der Pinnwand hier auf dieser Webseite vereinigt. Die Privatsphäre-Einstellungen für deine Pinnwand auf dieser Webseite geben dann an, wer die Konversationen sehen kann.";
 $a->strings["Comma separated applications to ignore"] = "Kommaseparierte Anwendungen, die ignoriert werden sollen";
 $a->strings["Problems with Facebook Real-Time Updates"] = "Probleme mit Facebook Echtzeit-Updates";
+$a->strings["Administrator"] = "Administrator";
 $a->strings["Facebook Connector Settings"] = "Facebook-Verbindungseinstellungen";
 $a->strings["Facebook API Key"] = "Facebook API Schlüssel";
 $a->strings["Error: it appears that you have specified the App-ID and -Secret in your .htconfig.php file. As long as they are specified there, they cannot be set using this form.<br><br>"] = "Fehler: du scheinst die App-ID und das App-Geheimnis in deiner .htconfig.php Datei angegeben zu haben. Solange sie dort festgelegt werden kannst du dieses Formular hier nicht verwenden.<br><br>";
@@ -1146,8 +1165,10 @@ $a->strings["Facebook Post"] = "Facebook Relai";
 $a->strings["Install Facebook Post connector for this account."] = "Facebook-Connector für dieses Konto installieren.";
 $a->strings["Remove Facebook Post connector"] = "Facebook-Connector entfernen";
 $a->strings["Suppress \"View on friendica\""] = "Unterdrücke \"Auf Friendica Ansehen\"";
+$a->strings["Mirror wall posts from facebook to friendica."] = "Spiegle Pinnwandeinträge von Facebook auf friendica";
 $a->strings["Post to page/group:"] = "Auf FB Seite/Gruppe veröffentlichen";
 $a->strings["Facebook Post Settings"] = "Facebook-Beitragseinstellungen";
+$a->strings["%s:"] = "%s:";
 $a->strings["%d person likes this"] = array(
 	0 => "%d Person mag das",
 	1 => "%d Leute mögen das",
@@ -1535,6 +1556,8 @@ $a->strings["If enabled all your <strong>public</strong> postings can be posted
 $a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an deinen StatusNet-Beitrag angehängt wird, um auf den Originalbeitrag zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde.";
 $a->strings["Allow posting to StatusNet"] = "Veröffentlichung bei StatusNet erlauben";
 $a->strings["Send public postings to StatusNet by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei StatusNet";
+$a->strings["Mirror all posts from statusnet that are no replies or repeated messages"] = "Spiegle alle Beiträge von StatusNet die keine Antworten oder wiederholten Nachrichten sind";
+$a->strings["Shortening method that optimizes the post"] = "Kürzungsverfahren, das den Beitrag optimiert";
 $a->strings["Send linked #-tags and @-names to StatusNet"] = "Sende verlinkte #-Tags und @-Namen nach StatusNet";
 $a->strings["Clear OAuth configuration"] = "OAuth-Konfiguration löschen";
 $a->strings["API URL"] = "API-URL";
@@ -1588,6 +1611,8 @@ $a->strings["If enabled all your <strong>public</strong> postings can be posted
 $a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an an deinen Twitter-Beitrag angehängt wird, um auf den Originalbeitrag zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde.";
 $a->strings["Allow posting to Twitter"] = "Veröffentlichung bei Twitter erlauben";
 $a->strings["Send public postings to Twitter by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter";
+$a->strings["Mirror all posts from twitter that are no replies or retweets"] = "Spiegle alle Beiträge von Twitter die keine Antworten oder wiederholten Nachrichten sind";
+$a->strings["Shortening method that optimizes the tweet"] = "Kürzungsverfahren, das den Tweet optimiert";
 $a->strings["Send linked #-tags and @-names to Twitter"] = "Sende verlinkte #-Tags und @-Namen nach Twitter";
 $a->strings["Consumer key"] = "Consumer Key";
 $a->strings["Consumer secret"] = "Consumer Secret";
@@ -1905,9 +1930,8 @@ $a->strings["seconds"] = "Sekunden";
 $a->strings["%1\$d %2\$s ago"] = "%1\$d %2\$s her";
 $a->strings["%s's birthday"] = "%ss Geburtstag";
 $a->strings["Happy Birthday %s"] = "Herzlichen Glückwunsch %s";
-$a->strings["From: "] = "Von: ";
 $a->strings["Image/photo"] = "Bild/Foto";
-$a->strings["<span><a href=\"%s\">%s</a> wrote the following <a href=\"%s\">post</a>:</span>"] = "<span><a href=\"%s\">%s</a> schrieb den folgenden <a href=\"%s\">Beitrag</a>:</span>";
+$a->strings["<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a href=\"%s\" target=\"external-link\">post</a>:</span>"] = "<span><a href=\"%s\" target=\"external-link\">%s</a> schrieb den folgenden <a href=\"%s\" target=\"external-link\">Eintrag</a>:</span>";
 $a->strings["$1 wrote:"] = "$1 hat geschrieben:";
 $a->strings["Encrypted content"] = "Verschlüsselter Inhalt";
 $a->strings["General Features"] = "Allgemeine Features";
@@ -2041,8 +2065,9 @@ $a->strings["Delete Selected Items"] = "Lösche die markierten Beiträge";
 $a->strings["Follow Thread"] = "Folge der Unterhaltung";
 $a->strings["%s likes this."] = "%s mag das.";
 $a->strings["%s doesn't like this."] = "%s mag das nicht.";
-$a->strings["<span  %1\$s>%2\$d people</span> like this."] = "<span  %1\$s>%2\$d Leute</span> mögen das.";
-$a->strings["<span  %1\$s>%2\$d people</span> don't like this."] = "<span  %1\$s>%2\$d Leute</span> mögen das nicht.";
+$a->strings["like this"] = "mögen dies";
+$a->strings["don't like this"] = "mögen dies nicht";
+$a->strings["people"] = "Leute";
 $a->strings["and"] = "und";
 $a->strings[", and %d other people"] = " und %d andere";
 $a->strings["%s like this."] = "%s mögen das.";
@@ -2067,6 +2092,10 @@ $a->strings["Password: "] = "Passwort: ";
 $a->strings["Remember me"] = "Anmeldedaten merken";
 $a->strings["Or login using OpenID: "] = "Oder melde dich mit deiner OpenID an: ";
 $a->strings["Forgot your password?"] = "Passwort vergessen?";
+$a->strings["Website Terms of Service"] = "Website Nutzungsbedingungen";
+$a->strings["terms of service"] = "Nutzungsbedingungen";
+$a->strings["Website Privacy Policy"] = "Website Datenschutzerklärung";
+$a->strings["privacy policy"] = "Datenschutzerklärung";
 $a->strings["Requested account is not available."] = "Das angefragte Profil ist nicht vorhanden.";
 $a->strings["Edit profile"] = "Profil bearbeiten";
 $a->strings["Message"] = "Nachricht";
diff --git a/view/en/smarty3/follow_notify_eml.tpl b/view/en/smarty3/follow_notify_eml.tpl
index ba07b19dad..e944aad1aa 100644
--- a/view/en/smarty3/follow_notify_eml.tpl
+++ b/view/en/smarty3/follow_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Dear {{$myname}},
 
diff --git a/view/en/smarty3/friend_complete_eml.tpl b/view/en/smarty3/friend_complete_eml.tpl
index 229b4fee86..8f72027e12 100644
--- a/view/en/smarty3/friend_complete_eml.tpl
+++ b/view/en/smarty3/friend_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Dear {{$username}},
 
diff --git a/view/en/smarty3/htconfig.tpl b/view/en/smarty3/htconfig.tpl
index 745bf03fe1..0cceabb653 100644
--- a/view/en/smarty3/htconfig.tpl
+++ b/view/en/smarty3/htconfig.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?php
 
 // Set the following for your MySQL installation
diff --git a/view/en/smarty3/intro_complete_eml.tpl b/view/en/smarty3/intro_complete_eml.tpl
index c3bc4697ec..7cf2dd5621 100644
--- a/view/en/smarty3/intro_complete_eml.tpl
+++ b/view/en/smarty3/intro_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Dear {{$username}},
 
diff --git a/view/en/smarty3/lostpass_eml.tpl b/view/en/smarty3/lostpass_eml.tpl
index 3b79d27910..f739d52521 100644
--- a/view/en/smarty3/lostpass_eml.tpl
+++ b/view/en/smarty3/lostpass_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Dear {{$username}},
 	A request was recently received at {{$sitename}} to reset your account 
diff --git a/view/en/smarty3/passchanged_eml.tpl b/view/en/smarty3/passchanged_eml.tpl
index 0d94be3c2b..c17860df6e 100644
--- a/view/en/smarty3/passchanged_eml.tpl
+++ b/view/en/smarty3/passchanged_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Dear {{$username}},
 	Your password has been changed as requested. Please retain this 
diff --git a/view/en/smarty3/register_open_eml.tpl b/view/en/smarty3/register_open_eml.tpl
index bfc1082bfb..73e78d90ed 100644
--- a/view/en/smarty3/register_open_eml.tpl
+++ b/view/en/smarty3/register_open_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Dear {{$username}},
 	Thank you for registering at {{$sitename}}. Your account has been created. 
diff --git a/view/en/smarty3/register_verify_eml.tpl b/view/en/smarty3/register_verify_eml.tpl
index dbdd1a997d..43257e78ac 100644
--- a/view/en/smarty3/register_verify_eml.tpl
+++ b/view/en/smarty3/register_verify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 A new user registration request was received at {{$sitename}} which requires 
 your approval. 
diff --git a/view/en/smarty3/request_notify_eml.tpl b/view/en/smarty3/request_notify_eml.tpl
index d01b8ff276..26a17b4bcf 100644
--- a/view/en/smarty3/request_notify_eml.tpl
+++ b/view/en/smarty3/request_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Dear {{$myname}},
 
diff --git a/view/en/smarty3/update_fail_eml.tpl b/view/en/smarty3/update_fail_eml.tpl
index a0983b6b90..931d9e455e 100644
--- a/view/en/smarty3/update_fail_eml.tpl
+++ b/view/en/smarty3/update_fail_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Hey, 
 I'm {{$sitename}};   
 The friendica developers released update {{$update}} recently, 
diff --git a/view/eo/smarty3/follow_notify_eml.tpl b/view/eo/smarty3/follow_notify_eml.tpl
index dd313c1f75..7edac031b7 100644
--- a/view/eo/smarty3/follow_notify_eml.tpl
+++ b/view/eo/smarty3/follow_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Kara {{$myname}},
 
diff --git a/view/eo/smarty3/friend_complete_eml.tpl b/view/eo/smarty3/friend_complete_eml.tpl
index 2987a8dc57..dc4cdd61ab 100644
--- a/view/eo/smarty3/friend_complete_eml.tpl
+++ b/view/eo/smarty3/friend_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Kara {{$username}},
 
diff --git a/view/eo/smarty3/intro_complete_eml.tpl b/view/eo/smarty3/intro_complete_eml.tpl
index eab7623a40..678c57b363 100644
--- a/view/eo/smarty3/intro_complete_eml.tpl
+++ b/view/eo/smarty3/intro_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Kara {{$username}},
 
diff --git a/view/eo/smarty3/lostpass_eml.tpl b/view/eo/smarty3/lostpass_eml.tpl
index ddde9fe514..6fcf8f9add 100644
--- a/view/eo/smarty3/lostpass_eml.tpl
+++ b/view/eo/smarty3/lostpass_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Kara {{$username}},
 	{{$sitename}} ricevis peton por rekomencigi vian pasvorton. 
diff --git a/view/eo/smarty3/passchanged_eml.tpl b/view/eo/smarty3/passchanged_eml.tpl
index 173828d561..3252a6e7cd 100644
--- a/view/eo/smarty3/passchanged_eml.tpl
+++ b/view/eo/smarty3/passchanged_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Kara {{$username}},
 	Via pasvorto estas ŝanĝita laŭ via peto. Bonvolu konservi ĉi tiun 
diff --git a/view/eo/smarty3/register_open_eml.tpl b/view/eo/smarty3/register_open_eml.tpl
index 84fc9ad908..29bcbb52d9 100644
--- a/view/eo/smarty3/register_open_eml.tpl
+++ b/view/eo/smarty3/register_open_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Kara {{$username}},
 	Dankon pro via registrado ĉe {{$sitename}}. Vian konton estas kreita. 
diff --git a/view/eo/smarty3/register_verify_eml.tpl b/view/eo/smarty3/register_verify_eml.tpl
index 4e960b9168..cc02c01f8c 100644
--- a/view/eo/smarty3/register_verify_eml.tpl
+++ b/view/eo/smarty3/register_verify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Nova peto por registrado atendas ĉe {{$sitename}} 
 kaj bezonas vian aprobon. 
diff --git a/view/eo/smarty3/request_notify_eml.tpl b/view/eo/smarty3/request_notify_eml.tpl
index d026ba66e3..9bba49fd0a 100644
--- a/view/eo/smarty3/request_notify_eml.tpl
+++ b/view/eo/smarty3/request_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Kara {{$myname}},
 
diff --git a/view/eo/smarty3/update_fail_eml.tpl b/view/eo/smarty3/update_fail_eml.tpl
index 4b7f240f91..7287132279 100644
--- a/view/eo/smarty3/update_fail_eml.tpl
+++ b/view/eo/smarty3/update_fail_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Saluton! 
 Mi estas {{$sitename}}.   
 La programistoj de Frienda eldonis ĝisdatigon {{$update}} antaŭ ne longe, 
diff --git a/view/es/smarty3/cmnt_received_eml.tpl b/view/es/smarty3/cmnt_received_eml.tpl
index d78eae2179..ee5db71221 100644
--- a/view/es/smarty3/cmnt_received_eml.tpl
+++ b/view/es/smarty3/cmnt_received_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Estimado/a {{$username}},
 
diff --git a/view/es/smarty3/follow_notify_eml.tpl b/view/es/smarty3/follow_notify_eml.tpl
index 86e09003ad..bed92f59ca 100644
--- a/view/es/smarty3/follow_notify_eml.tpl
+++ b/view/es/smarty3/follow_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Estimado/a {{$myname}},
 
diff --git a/view/es/smarty3/friend_complete_eml.tpl b/view/es/smarty3/friend_complete_eml.tpl
index be3c817771..7ed5140683 100644
--- a/view/es/smarty3/friend_complete_eml.tpl
+++ b/view/es/smarty3/friend_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Estimado/a {{$username}},
 
diff --git a/view/es/smarty3/htconfig.tpl b/view/es/smarty3/htconfig.tpl
index 5696245c77..f5796445b5 100644
--- a/view/es/smarty3/htconfig.tpl
+++ b/view/es/smarty3/htconfig.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?php
 
 // Set the following for your MySQL installation
diff --git a/view/es/smarty3/intro_complete_eml.tpl b/view/es/smarty3/intro_complete_eml.tpl
index 3add926fe5..e77fce2cd6 100644
--- a/view/es/smarty3/intro_complete_eml.tpl
+++ b/view/es/smarty3/intro_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Estimado/a {{$username}},
 
diff --git a/view/es/smarty3/lostpass_eml.tpl b/view/es/smarty3/lostpass_eml.tpl
index 41545bf2d6..7a78067aeb 100644
--- a/view/es/smarty3/lostpass_eml.tpl
+++ b/view/es/smarty3/lostpass_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Estimado/a {{$username}},
 	
diff --git a/view/es/smarty3/mail_received_html_body_eml.tpl b/view/es/smarty3/mail_received_html_body_eml.tpl
index 4f80df28fc..4f554bc086 100644
--- a/view/es/smarty3/mail_received_html_body_eml.tpl
+++ b/view/es/smarty3/mail_received_html_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
diff --git a/view/es/smarty3/mail_received_text_body_eml.tpl b/view/es/smarty3/mail_received_text_body_eml.tpl
index 22b77b7246..7ff093b913 100644
--- a/view/es/smarty3/mail_received_text_body_eml.tpl
+++ b/view/es/smarty3/mail_received_text_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Has recibido un nuevo mensaje privado de '{{$from}}' en {{$siteName}}.
 	
 {{$title}}
diff --git a/view/es/smarty3/passchanged_eml.tpl b/view/es/smarty3/passchanged_eml.tpl
index eb93eb369e..e17776eaaf 100644
--- a/view/es/smarty3/passchanged_eml.tpl
+++ b/view/es/smarty3/passchanged_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Estimado/a {{$username}},
 
diff --git a/view/es/smarty3/register_open_eml.tpl b/view/es/smarty3/register_open_eml.tpl
index c65b13497c..5d56304619 100644
--- a/view/es/smarty3/register_open_eml.tpl
+++ b/view/es/smarty3/register_open_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Estimado/a {{$username}},
 
diff --git a/view/es/smarty3/register_verify_eml.tpl b/view/es/smarty3/register_verify_eml.tpl
index 10c35863e6..a67aedd106 100644
--- a/view/es/smarty3/register_verify_eml.tpl
+++ b/view/es/smarty3/register_verify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Se ha recibido la solicitud de registro de un nuevo usuario en
 {{$sitename}} que requiere tu aprobación.
diff --git a/view/es/smarty3/request_notify_eml.tpl b/view/es/smarty3/request_notify_eml.tpl
index cb787a8a69..f7bdf3294c 100644
--- a/view/es/smarty3/request_notify_eml.tpl
+++ b/view/es/smarty3/request_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Estimado/a {{$myname}},
 
diff --git a/view/es/smarty3/wall_received_eml.tpl b/view/es/smarty3/wall_received_eml.tpl
index 8f495d9efa..a69c421c20 100644
--- a/view/es/smarty3/wall_received_eml.tpl
+++ b/view/es/smarty3/wall_received_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Estimado/a {{$username}},
 
diff --git a/view/fr/smarty3/cmnt_received_eml.tpl b/view/fr/smarty3/cmnt_received_eml.tpl
index bd7c441eac..a2c1407f57 100644
--- a/view/fr/smarty3/cmnt_received_eml.tpl
+++ b/view/fr/smarty3/cmnt_received_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Cher(e) {{$username}},
 
diff --git a/view/fr/smarty3/cmnt_received_html_body_eml.tpl b/view/fr/smarty3/cmnt_received_html_body_eml.tpl
index 408b643ec4..d4f7ee7efd 100644
--- a/view/fr/smarty3/cmnt_received_html_body_eml.tpl
+++ b/view/fr/smarty3/cmnt_received_html_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
diff --git a/view/fr/smarty3/cmnt_received_text_body_eml.tpl b/view/fr/smarty3/cmnt_received_text_body_eml.tpl
index 76828474bf..b0360655b6 100644
--- a/view/fr/smarty3/cmnt_received_text_body_eml.tpl
+++ b/view/fr/smarty3/cmnt_received_text_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Cher(e) {{$username}},
 
diff --git a/view/fr/smarty3/follow_notify_eml.tpl b/view/fr/smarty3/follow_notify_eml.tpl
index 05fec413ea..7f7da5ec35 100644
--- a/view/fr/smarty3/follow_notify_eml.tpl
+++ b/view/fr/smarty3/follow_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Cher(e) {{$myname}},
 
diff --git a/view/fr/smarty3/friend_complete_eml.tpl b/view/fr/smarty3/friend_complete_eml.tpl
index e0c0078e55..2f68255a27 100644
--- a/view/fr/smarty3/friend_complete_eml.tpl
+++ b/view/fr/smarty3/friend_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Cher(e) {{$username}},
 
diff --git a/view/fr/smarty3/htconfig.tpl b/view/fr/smarty3/htconfig.tpl
index 75d6a77e89..033e481940 100644
--- a/view/fr/smarty3/htconfig.tpl
+++ b/view/fr/smarty3/htconfig.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?php
 
 // Set the following for your MySQL installation
diff --git a/view/fr/smarty3/intro_complete_eml.tpl b/view/fr/smarty3/intro_complete_eml.tpl
index e3ca253258..4e1f8a5d52 100644
--- a/view/fr/smarty3/intro_complete_eml.tpl
+++ b/view/fr/smarty3/intro_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Cher(e) {{$username}},
 
diff --git a/view/fr/smarty3/lostpass_eml.tpl b/view/fr/smarty3/lostpass_eml.tpl
index 0674e08ccd..13801872dc 100644
--- a/view/fr/smarty3/lostpass_eml.tpl
+++ b/view/fr/smarty3/lostpass_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Cher(e) {{$username}},
 
diff --git a/view/fr/smarty3/mail_received_html_body_eml.tpl b/view/fr/smarty3/mail_received_html_body_eml.tpl
index cf1c28627f..28372e421c 100644
--- a/view/fr/smarty3/mail_received_html_body_eml.tpl
+++ b/view/fr/smarty3/mail_received_html_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
diff --git a/view/fr/smarty3/mail_received_text_body_eml.tpl b/view/fr/smarty3/mail_received_text_body_eml.tpl
index 71c545ed61..d1f03fb6e3 100644
--- a/view/fr/smarty3/mail_received_text_body_eml.tpl
+++ b/view/fr/smarty3/mail_received_text_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$from}} vous a envoy� un message � {{$siteName}}.
 	
 {{$title}}
diff --git a/view/fr/smarty3/passchanged_eml.tpl b/view/fr/smarty3/passchanged_eml.tpl
index 28eed70f15..47b10d3f5b 100644
--- a/view/fr/smarty3/passchanged_eml.tpl
+++ b/view/fr/smarty3/passchanged_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Cher(e) {{$username}},
 
diff --git a/view/fr/smarty3/register_open_eml.tpl b/view/fr/smarty3/register_open_eml.tpl
index 373f314b09..320a58016e 100644
--- a/view/fr/smarty3/register_open_eml.tpl
+++ b/view/fr/smarty3/register_open_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Cher(e) {{$username}},
 
diff --git a/view/fr/smarty3/register_verify_eml.tpl b/view/fr/smarty3/register_verify_eml.tpl
index 22b6d8a947..8127010dd5 100644
--- a/view/fr/smarty3/register_verify_eml.tpl
+++ b/view/fr/smarty3/register_verify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Une nouvelle demande d'inscription a été reçue sur {{$sitename}}, et elle
 nécessite votre approbation.
diff --git a/view/fr/smarty3/request_notify_eml.tpl b/view/fr/smarty3/request_notify_eml.tpl
index 3f5f8a1f44..cf2fe0cf03 100644
--- a/view/fr/smarty3/request_notify_eml.tpl
+++ b/view/fr/smarty3/request_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Cher(e) {{$myname}},
 
diff --git a/view/fr/smarty3/wall_received_eml.tpl b/view/fr/smarty3/wall_received_eml.tpl
index 991fad8574..2f91457fde 100644
--- a/view/fr/smarty3/wall_received_eml.tpl
+++ b/view/fr/smarty3/wall_received_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Cher(e) {{$username}},
 
diff --git a/view/group_edit.tpl b/view/group_edit.tpl
index 35d2981118..2fa2b1a552 100644
--- a/view/group_edit.tpl
+++ b/view/group_edit.tpl
@@ -15,9 +15,9 @@
 </div>
 
 
-{{ if $groupedit_info }}
+{{ if $groupeditor }}
 	<div id="group-update-wrapper">
-		{{ inc groupeditor.tpl with $groupeditor=$groupedit_info }}{{ endinc }}
+		{{ inc groupeditor.tpl }}{{ endinc }}
 	</div>
 {{ endif }}
 {{ if $desc }}<div id="group-edit-desc">$desc</div>{{ endif }}
diff --git a/view/is/smarty3/follow_notify_eml.tpl b/view/is/smarty3/follow_notify_eml.tpl
index 127f05a457..e96380112c 100644
--- a/view/is/smarty3/follow_notify_eml.tpl
+++ b/view/is/smarty3/follow_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Góðan daginn {{$myname}},
 
diff --git a/view/is/smarty3/friend_complete_eml.tpl b/view/is/smarty3/friend_complete_eml.tpl
index 1bc440269e..5bdbeff51b 100644
--- a/view/is/smarty3/friend_complete_eml.tpl
+++ b/view/is/smarty3/friend_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Góðan daginn {{$username}}, 
 
diff --git a/view/is/smarty3/intro_complete_eml.tpl b/view/is/smarty3/intro_complete_eml.tpl
index bbf86cf157..11b6bbd466 100644
--- a/view/is/smarty3/intro_complete_eml.tpl
+++ b/view/is/smarty3/intro_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Góðan daginn {{$username}},
 
diff --git a/view/is/smarty3/lostpass_eml.tpl b/view/is/smarty3/lostpass_eml.tpl
index d2010ac8fe..a6f83ed51e 100644
--- a/view/is/smarty3/lostpass_eml.tpl
+++ b/view/is/smarty3/lostpass_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Góðan dag {{$username}},
 	Beiðni barst á {{$sitename}} um að endursetja 
diff --git a/view/is/smarty3/passchanged_eml.tpl b/view/is/smarty3/passchanged_eml.tpl
index c19551208e..6d08a07636 100644
--- a/view/is/smarty3/passchanged_eml.tpl
+++ b/view/is/smarty3/passchanged_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Góðan daginn {{$username}},
 	Lykilorð þínu hefur verið breytt einsog umbeðið var.  Endilega geyma þessar 
diff --git a/view/is/smarty3/register_open_eml.tpl b/view/is/smarty3/register_open_eml.tpl
index 0673224d1f..8ab04b3aed 100644
--- a/view/is/smarty3/register_open_eml.tpl
+++ b/view/is/smarty3/register_open_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Góðan daginn {{$username}},
 	Takk fyrir að skrá þig á {{$sitename}}. Notandinn þinn hefur verið stofnaður. 
diff --git a/view/is/smarty3/register_verify_eml.tpl b/view/is/smarty3/register_verify_eml.tpl
index cf6362c4b7..1e6060df9b 100644
--- a/view/is/smarty3/register_verify_eml.tpl
+++ b/view/is/smarty3/register_verify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Beiðni um nýjan notanda barst {{$sitename}} sem krefst 
 þíns samþykkis. 
diff --git a/view/is/smarty3/request_notify_eml.tpl b/view/is/smarty3/request_notify_eml.tpl
index 36d8f217af..6ecec12f3a 100644
--- a/view/is/smarty3/request_notify_eml.tpl
+++ b/view/is/smarty3/request_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Góðan dag {{$myname}},
 
diff --git a/view/is/smarty3/update_fail_eml.tpl b/view/is/smarty3/update_fail_eml.tpl
index 201f87131d..227ee288ba 100644
--- a/view/is/smarty3/update_fail_eml.tpl
+++ b/view/is/smarty3/update_fail_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Hæ, 
 Ég er {{$sitename}}.   
 Þróunarteymi friendica gáfu nýlega út uppfærslu {{$update}}, 
diff --git a/view/it/smarty3/cmnt_received_eml.tpl b/view/it/smarty3/cmnt_received_eml.tpl
index f35dc3dc9f..479c566ded 100644
--- a/view/it/smarty3/cmnt_received_eml.tpl
+++ b/view/it/smarty3/cmnt_received_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Caro/a {{$username}},
 
diff --git a/view/it/smarty3/cmnt_received_html_body_eml.tpl b/view/it/smarty3/cmnt_received_html_body_eml.tpl
index 80d6118073..356e3bc480 100644
--- a/view/it/smarty3/cmnt_received_html_body_eml.tpl
+++ b/view/it/smarty3/cmnt_received_html_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
diff --git a/view/it/smarty3/cmnt_received_text_body_eml.tpl b/view/it/smarty3/cmnt_received_text_body_eml.tpl
index f35dc3dc9f..479c566ded 100644
--- a/view/it/smarty3/cmnt_received_text_body_eml.tpl
+++ b/view/it/smarty3/cmnt_received_text_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Caro/a {{$username}},
 
diff --git a/view/it/smarty3/follow_notify_eml.tpl b/view/it/smarty3/follow_notify_eml.tpl
index 0bfc375520..925d5b2d08 100644
--- a/view/it/smarty3/follow_notify_eml.tpl
+++ b/view/it/smarty3/follow_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Ciao {{$myname}},
 
diff --git a/view/it/smarty3/friend_complete_eml.tpl b/view/it/smarty3/friend_complete_eml.tpl
index daeaae9016..667a1f445e 100644
--- a/view/it/smarty3/friend_complete_eml.tpl
+++ b/view/it/smarty3/friend_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Ciao {{$username}},
 
diff --git a/view/it/smarty3/htconfig.tpl b/view/it/smarty3/htconfig.tpl
index 5696245c77..f5796445b5 100644
--- a/view/it/smarty3/htconfig.tpl
+++ b/view/it/smarty3/htconfig.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?php
 
 // Set the following for your MySQL installation
diff --git a/view/it/smarty3/intro_complete_eml.tpl b/view/it/smarty3/intro_complete_eml.tpl
index 69fce81411..5c831f0d3f 100644
--- a/view/it/smarty3/intro_complete_eml.tpl
+++ b/view/it/smarty3/intro_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Ciao {{$username}},
 
diff --git a/view/it/smarty3/lostpass_eml.tpl b/view/it/smarty3/lostpass_eml.tpl
index c336cf3c1d..04a6a0716e 100644
--- a/view/it/smarty3/lostpass_eml.tpl
+++ b/view/it/smarty3/lostpass_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Ciao {{$username}},
 	Su {{$sitename}} è stata ricevuta una richiesta di azzeramento di password per un account. 
diff --git a/view/it/smarty3/mail_received_html_body_eml.tpl b/view/it/smarty3/mail_received_html_body_eml.tpl
index f0bf679d0e..4dc87f8064 100644
--- a/view/it/smarty3/mail_received_html_body_eml.tpl
+++ b/view/it/smarty3/mail_received_html_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
diff --git a/view/it/smarty3/mail_received_text_body_eml.tpl b/view/it/smarty3/mail_received_text_body_eml.tpl
index 79e133fcef..3cb7b82d48 100644
--- a/view/it/smarty3/mail_received_text_body_eml.tpl
+++ b/view/it/smarty3/mail_received_text_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Hai ricevuto un nuovo messsaggio privato su {{$siteName}} da '{{$from}}'.
 	
 {{$title}}
diff --git a/view/it/smarty3/passchanged_eml.tpl b/view/it/smarty3/passchanged_eml.tpl
index 046588e1f2..32970c9cb5 100644
--- a/view/it/smarty3/passchanged_eml.tpl
+++ b/view/it/smarty3/passchanged_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Ciao {{$username}},
 	La tua password è cambiata come hai richiesto. Conserva queste 
diff --git a/view/it/smarty3/register_open_eml.tpl b/view/it/smarty3/register_open_eml.tpl
index 23dcaf2c8d..e5f909af57 100644
--- a/view/it/smarty3/register_open_eml.tpl
+++ b/view/it/smarty3/register_open_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Ciao {{$username}},
 	Grazie per aver effettuato la registrazione a {{$sitename}}. Il tuo account è stato creato. 
diff --git a/view/it/smarty3/register_verify_eml.tpl b/view/it/smarty3/register_verify_eml.tpl
index 743370b3df..9ce1f8f005 100644
--- a/view/it/smarty3/register_verify_eml.tpl
+++ b/view/it/smarty3/register_verify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Su {{$sitename}} è stata ricevuta una nuova richiesta di registrazione da parte di un utente che richiede 
 la tua approvazione. 
diff --git a/view/it/smarty3/request_notify_eml.tpl b/view/it/smarty3/request_notify_eml.tpl
index df3a7323c1..47240c5a36 100644
--- a/view/it/smarty3/request_notify_eml.tpl
+++ b/view/it/smarty3/request_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Ciao {{$myname}},
 
diff --git a/view/it/smarty3/wall_received_eml.tpl b/view/it/smarty3/wall_received_eml.tpl
index 909ec86d44..30b53d11ef 100644
--- a/view/it/smarty3/wall_received_eml.tpl
+++ b/view/it/smarty3/wall_received_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Caro/a {{$username}},
 
diff --git a/view/it/smarty3/wall_received_html_body_eml.tpl b/view/it/smarty3/wall_received_html_body_eml.tpl
index 3fa724c3bc..8096fed226 100644
--- a/view/it/smarty3/wall_received_html_body_eml.tpl
+++ b/view/it/smarty3/wall_received_html_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
diff --git a/view/it/smarty3/wall_received_text_body_eml.tpl b/view/it/smarty3/wall_received_text_body_eml.tpl
index ad7f83abcb..2031744a64 100644
--- a/view/it/smarty3/wall_received_text_body_eml.tpl
+++ b/view/it/smarty3/wall_received_text_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Caro {{$username}},
 
diff --git a/view/mail_display.tpl b/view/mail_display.tpl
index 396aa46c0a..b328d32a27 100644
--- a/view/mail_display.tpl
+++ b/view/mail_display.tpl
@@ -1,6 +1,6 @@
 
-{{ for $mails as $mail_item }}
-	{{ inc mail_conv.tpl with $mail=$mail_item }}{{endinc}}
+{{ for $mails as $mail }}
+	{{ inc mail_conv.tpl }}{{endinc}}
 {{ endfor }}
 
 {{ if $canreply }}
diff --git a/view/maintenance.tpl b/view/maintenance.tpl
new file mode 100644
index 0000000000..bbe15d46a8
--- /dev/null
+++ b/view/maintenance.tpl
@@ -0,0 +1 @@
+<div id="maintenance-message">$sysdown</div>
diff --git a/view/nb-no/smarty3/follow_notify_eml.tpl b/view/nb-no/smarty3/follow_notify_eml.tpl
index 094539cf5b..eedeef85de 100644
--- a/view/nb-no/smarty3/follow_notify_eml.tpl
+++ b/view/nb-no/smarty3/follow_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Kjære {{$myname}},
 
diff --git a/view/nb-no/smarty3/friend_complete_eml.tpl b/view/nb-no/smarty3/friend_complete_eml.tpl
index 17cc38a8ca..f8348c51d5 100644
--- a/view/nb-no/smarty3/friend_complete_eml.tpl
+++ b/view/nb-no/smarty3/friend_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Kjære {{$username}},
 
diff --git a/view/nb-no/smarty3/intro_complete_eml.tpl b/view/nb-no/smarty3/intro_complete_eml.tpl
index edf699936e..e00d99f8ba 100644
--- a/view/nb-no/smarty3/intro_complete_eml.tpl
+++ b/view/nb-no/smarty3/intro_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Kjære {{$username}},
 
diff --git a/view/nb-no/smarty3/lostpass_eml.tpl b/view/nb-no/smarty3/lostpass_eml.tpl
index e0f335ff18..11ef4aab7d 100644
--- a/view/nb-no/smarty3/lostpass_eml.tpl
+++ b/view/nb-no/smarty3/lostpass_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Kjære {{$username}},
 	En forespørsel ble nylig mottatt hos {{$sitename}} om å tilbakestille din kontos 
diff --git a/view/nb-no/smarty3/passchanged_eml.tpl b/view/nb-no/smarty3/passchanged_eml.tpl
index 2d3144bc52..d5137fc47d 100644
--- a/view/nb-no/smarty3/passchanged_eml.tpl
+++ b/view/nb-no/smarty3/passchanged_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Kjære {{$username}},
 	Ditt passord har blitt endret som forespurt. Vennligst ta vare på denne 
diff --git a/view/nb-no/smarty3/register_open_eml.tpl b/view/nb-no/smarty3/register_open_eml.tpl
index 7fe8e5983f..43b150da85 100644
--- a/view/nb-no/smarty3/register_open_eml.tpl
+++ b/view/nb-no/smarty3/register_open_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Kjære {{$username}},
 	Takk for at du registrerte deg hos {{$sitename}}. Kontoen din er opprettet. 
diff --git a/view/nb-no/smarty3/register_verify_eml.tpl b/view/nb-no/smarty3/register_verify_eml.tpl
index 9efb9b08b6..4b765885e1 100644
--- a/view/nb-no/smarty3/register_verify_eml.tpl
+++ b/view/nb-no/smarty3/register_verify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 En ny forespørsel om brukerregistering ble mottatt hos {{$sitename}} og krever  
 din godkjenning. 
diff --git a/view/nb-no/smarty3/request_notify_eml.tpl b/view/nb-no/smarty3/request_notify_eml.tpl
index ae89c6141c..9851b4f170 100644
--- a/view/nb-no/smarty3/request_notify_eml.tpl
+++ b/view/nb-no/smarty3/request_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Kjære {{$myname}},
 
diff --git a/view/nb-no/smarty3/update_fail_eml.tpl b/view/nb-no/smarty3/update_fail_eml.tpl
index 1116f2cd7d..771d4b97f3 100644
--- a/view/nb-no/smarty3/update_fail_eml.tpl
+++ b/view/nb-no/smarty3/update_fail_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Hei,  
 jeg er {{$sitename}}.   
 Friendica-utviklerne slapp nylig oppdateringen {{$update}}, 
diff --git a/view/nogroup-template.tpl b/view/nogroup-template.tpl
index f27f158f5d..dd00ed097a 100644
--- a/view/nogroup-template.tpl
+++ b/view/nogroup-template.tpl
@@ -1,7 +1,7 @@
 <h1>$header</h1>
 
-{{ for $contacts as $c }}
-	{{ inc contact_template.tpl with $contact=$c }}{{ endinc }}
+{{ for $contacts as $contact }}
+	{{ inc contact_template.tpl }}{{ endinc }}
 {{ endfor }}
 <div id="contact-edit-end"></div>
 
diff --git a/view/photos_recent.tpl b/view/photos_recent.tpl
index 7ae3540245..1df78cb7be 100644
--- a/view/photos_recent.tpl
+++ b/view/photos_recent.tpl
@@ -4,8 +4,8 @@
 {{ endif }}
 
 <div class="photos">
-{{ for $photos as $ph }}
-	{{ inc photo_top.tpl with $photo=$ph }}{{ endinc }}
+{{ for $photos as $photo }}
+	{{ inc photo_top.tpl }}{{ endinc }}
 {{ endfor }}
 </div>
 <div class="photos-end"></div>
diff --git a/view/pl/messages.po b/view/pl/messages.po
index 5f27256b0b..adfcfb8c6f 100644
--- a/view/pl/messages.po
+++ b/view/pl/messages.po
@@ -20,14 +20,14 @@
 #   <nauczyciello@o2.pl>, 2012.
 #   <piotr.blonkowski@gmail.com>, 2012.
 #   <rightxhere1@gmail.com>, 2012.
-#   <szsargalski@interia.pl>, 2012.
+#   <szsargalski@interia.pl>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2012-12-16 10:00-0800\n"
-"PO-Revision-Date: 2012-12-16 21:36+0000\n"
-"Last-Translator: abix_adamj <a.jurkiewicz@abix.info.pl>\n"
+"POT-Creation-Date: 2013-01-01 10:00-0800\n"
+"PO-Revision-Date: 2013-01-03 18:25+0000\n"
+"Last-Translator: rcmaniac <szsargalski@interia.pl>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -58,8 +58,8 @@ msgstr "Nie udało się zaktualizować kontaktu."
 #: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:995
 #: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:135
 #: ../../mod/notifications.php:66 ../../mod/contacts.php:147
-#: ../../mod/settings.php:91 ../../mod/settings.php:541
-#: ../../mod/settings.php:546 ../../mod/manage.php:90 ../../mod/network.php:6
+#: ../../mod/settings.php:91 ../../mod/settings.php:542
+#: ../../mod/settings.php:547 ../../mod/manage.php:90 ../../mod/network.php:6
 #: ../../mod/notes.php:20 ../../mod/uimport.php:23 ../../mod/wallmessage.php:9
 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
@@ -78,7 +78,7 @@ msgstr "Nie udało się zaktualizować kontaktu."
 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:166
 #: ../../addon/fbpost/fbpost.php:172
 #: ../../addon/dav/friendica/layout.fnk.php:354
-#: ../../addon/tumblr/tumblr.php:34 ../../include/items.php:3977
+#: ../../addon/tumblr/tumblr.php:34 ../../include/items.php:3987
 #: ../../index.php:333 ../../addon.old/facebook/facebook.php:510
 #: ../../addon.old/facebook/facebook.php:516
 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165
@@ -111,8 +111,8 @@ msgstr "Jeśli nie jesteś pewien, co zrobić na tej stronie, użyj <strong>tera
 msgid "Return to contact editor"
 msgstr "Wróć do edytora kontaktów"
 
-#: ../../mod/crepair.php:148 ../../mod/settings.php:561
-#: ../../mod/settings.php:587 ../../mod/admin.php:695 ../../mod/admin.php:705
+#: ../../mod/crepair.php:148 ../../mod/settings.php:562
+#: ../../mod/settings.php:588 ../../mod/admin.php:731 ../../mod/admin.php:741
 msgid "Name"
 msgstr "Imię"
 
@@ -149,18 +149,18 @@ msgid "New photo from this URL"
 msgstr "Nowe zdjęcie z tej ścieżki"
 
 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
-#: ../../mod/events.php:455 ../../mod/photos.php:1028
-#: ../../mod/photos.php:1100 ../../mod/photos.php:1363
-#: ../../mod/photos.php:1403 ../../mod/photos.php:1447
-#: ../../mod/photos.php:1519 ../../mod/install.php:246
-#: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199
-#: ../../mod/content.php:693 ../../mod/contacts.php:352
-#: ../../mod/settings.php:559 ../../mod/settings.php:669
-#: ../../mod/settings.php:738 ../../mod/settings.php:810
-#: ../../mod/settings.php:1017 ../../mod/group.php:85 ../../mod/mood.php:137
-#: ../../mod/message.php:301 ../../mod/message.php:487 ../../mod/admin.php:445
-#: ../../mod/admin.php:692 ../../mod/admin.php:829 ../../mod/admin.php:1028
-#: ../../mod/admin.php:1115 ../../mod/profiles.php:604
+#: ../../mod/events.php:466 ../../mod/photos.php:1028
+#: ../../mod/photos.php:1118 ../../mod/photos.php:1402
+#: ../../mod/photos.php:1442 ../../mod/photos.php:1486
+#: ../../mod/photos.php:1569 ../../mod/install.php:248
+#: ../../mod/install.php:286 ../../mod/localtime.php:45 ../../mod/poke.php:199
+#: ../../mod/content.php:710 ../../mod/contacts.php:352
+#: ../../mod/settings.php:560 ../../mod/settings.php:670
+#: ../../mod/settings.php:739 ../../mod/settings.php:811
+#: ../../mod/settings.php:1018 ../../mod/group.php:87 ../../mod/mood.php:137
+#: ../../mod/message.php:301 ../../mod/message.php:527 ../../mod/admin.php:461
+#: ../../mod/admin.php:728 ../../mod/admin.php:865 ../../mod/admin.php:1064
+#: ../../mod/admin.php:1151 ../../mod/profiles.php:604
 #: ../../mod/invite.php:119 ../../addon/fromgplus/fromgplus.php:44
 #: ../../addon/facebook/facebook.php:619
 #: ../../addon/snautofollow/snautofollow.php:64
@@ -169,8 +169,8 @@ msgstr "Nowe zdjęcie z tej ścieżki"
 #: ../../addon/page/page.php:211 ../../addon/planets/planets.php:158
 #: ../../addon/uhremotestorage/uhremotestorage.php:89
 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
-#: ../../addon/remote_permissions/remote_permissions.php:47
-#: ../../addon/remote_permissions/remote_permissions.php:195
+#: ../../addon/remote_permissions/remote_permissions.php:48
+#: ../../addon/remote_permissions/remote_permissions.php:196
 #: ../../addon/startpage/startpage.php:92
 #: ../../addon/geonames/geonames.php:187
 #: ../../addon/forumlist/forumlist.php:178
@@ -182,7 +182,7 @@ msgstr "Nowe zdjęcie z tej ścieżki"
 #: ../../addon/libravatar/libravatar.php:99
 #: ../../addon/libertree/libertree.php:90 ../../addon/altpager/altpager.php:91
 #: ../../addon/altpager/altpager.php:98 ../../addon/mathjax/mathjax.php:42
-#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:98
+#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:99
 #: ../../addon/gravatar/gravatar.php:95
 #: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93
 #: ../../addon/jappixmini/jappixmini.php:307
@@ -191,18 +191,18 @@ msgstr "Nowe zdjęcie z tej ścieżki"
 #: ../../addon/statusnet/statusnet.php:318
 #: ../../addon/statusnet/statusnet.php:325
 #: ../../addon/statusnet/statusnet.php:353
-#: ../../addon/statusnet/statusnet.php:700 ../../addon/tumblr/tumblr.php:233
+#: ../../addon/statusnet/statusnet.php:703 ../../addon/tumblr/tumblr.php:233
 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88
 #: ../../addon/wppost/wppost.php:110 ../../addon/showmore/showmore.php:48
 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180
-#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:506
+#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:515
 #: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77
 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103
 #: ../../view/theme/cleanzero/config.php:80
-#: ../../view/theme/diabook/theme.php:642
+#: ../../view/theme/diabook/theme.php:643
 #: ../../view/theme/diabook/config.php:152
 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70
-#: ../../object/Item.php:577 ../../addon.old/fromgplus/fromgplus.php:40
+#: ../../object/Item.php:603 ../../addon.old/fromgplus/fromgplus.php:40
 #: ../../addon.old/facebook/facebook.php:619
 #: ../../addon.old/snautofollow/snautofollow.php:64
 #: ../../addon.old/bg/bg.php:90 ../../addon.old/fbpost/fbpost.php:226
@@ -302,86 +302,87 @@ msgstr "d, M d "
 msgid "Edit event"
 msgstr "Edytuj wydarzenie"
 
-#: ../../mod/events.php:323 ../../include/text.php:1190
+#: ../../mod/events.php:323 ../../include/text.php:1247
 msgid "link to source"
 msgstr "link do źródła"
 
-#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91
-#: ../../include/nav.php:52 ../../boot.php:1748
+#: ../../mod/events.php:358 ../../view/theme/diabook/theme.php:92
+#: ../../include/nav.php:52 ../../boot.php:1791
 msgid "Events"
 msgstr "Wydarzenia"
 
-#: ../../mod/events.php:348
+#: ../../mod/events.php:359
 msgid "Create New Event"
 msgstr "Stwórz nowe wydarzenie"
 
-#: ../../mod/events.php:349 ../../addon/dav/friendica/layout.fnk.php:263
+#: ../../mod/events.php:360 ../../addon/dav/friendica/layout.fnk.php:263
 #: ../../addon.old/dav/friendica/layout.fnk.php:263
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: ../../mod/events.php:350 ../../mod/install.php:205
+#: ../../mod/events.php:361 ../../mod/install.php:207
 #: ../../addon/dav/friendica/layout.fnk.php:266
 #: ../../addon.old/dav/friendica/layout.fnk.php:266
 msgid "Next"
 msgstr "Następny"
 
-#: ../../mod/events.php:423
+#: ../../mod/events.php:434
 msgid "hour:minute"
 msgstr "godzina:minuta"
 
-#: ../../mod/events.php:433
+#: ../../mod/events.php:444
 msgid "Event details"
 msgstr "Szczegóły wydarzenia"
 
-#: ../../mod/events.php:434
+#: ../../mod/events.php:445
 #, php-format
 msgid "Format is %s %s. Starting date and Title are required."
 msgstr ""
 
-#: ../../mod/events.php:436
+#: ../../mod/events.php:447
 msgid "Event Starts:"
 msgstr "Rozpoczęcie wydarzenia:"
 
-#: ../../mod/events.php:436 ../../mod/events.php:450
+#: ../../mod/events.php:447 ../../mod/events.php:461
 msgid "Required"
 msgstr "Wymagany"
 
-#: ../../mod/events.php:439
+#: ../../mod/events.php:450
 msgid "Finish date/time is not known or not relevant"
 msgstr "Data/czas zakończenia nie jest znana lub jest nieistotna"
 
-#: ../../mod/events.php:441
+#: ../../mod/events.php:452
 msgid "Event Finishes:"
 msgstr "Zakończenie wydarzenia:"
 
-#: ../../mod/events.php:444
+#: ../../mod/events.php:455
 msgid "Adjust for viewer timezone"
 msgstr ""
 
-#: ../../mod/events.php:446
+#: ../../mod/events.php:457
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../../mod/events.php:448 ../../mod/directory.php:134
+#: ../../mod/events.php:459 ../../mod/directory.php:134
 #: ../../addon/forumdirectory/forumdirectory.php:156
-#: ../../include/event.php:40 ../../include/bb2diaspora.php:412
-#: ../../boot.php:1278
+#: ../../include/event.php:40 ../../include/bb2diaspora.php:415
+#: ../../boot.php:1312
 msgid "Location:"
 msgstr "Lokalizacja"
 
-#: ../../mod/events.php:450
+#: ../../mod/events.php:461
 msgid "Title:"
 msgstr "Tytuł:"
 
-#: ../../mod/events.php:452
+#: ../../mod/events.php:463
 msgid "Share this event"
 msgstr "Udostępnij te wydarzenie"
 
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:145
-#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:560
-#: ../../mod/settings.php:586 ../../addon/js_upload/js_upload.php:45
-#: ../../include/conversation.php:1009
+#: ../../mod/dfrn_request.php:848 ../../mod/settings.php:561
+#: ../../mod/settings.php:587 ../../mod/fbrowser.php:81
+#: ../../mod/fbrowser.php:116 ../../addon/js_upload/js_upload.php:45
+#: ../../include/conversation.php:1045
 #: ../../addon.old/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr "Anuluj"
@@ -427,44 +428,44 @@ msgid ""
 " and/or create new posts for you?"
 msgstr "Czy chcesz umożliwić tej aplikacji dostęp do Twoich wpisów, kontaktów oraz pozwolić jej na pisanie za Ciebie postów?"
 
-#: ../../mod/api.php:105 ../../mod/dfrn_request.php:835
-#: ../../mod/settings.php:933 ../../mod/settings.php:939
-#: ../../mod/settings.php:947 ../../mod/settings.php:951
-#: ../../mod/settings.php:956 ../../mod/settings.php:962
-#: ../../mod/settings.php:968 ../../mod/settings.php:974
-#: ../../mod/settings.php:1004 ../../mod/settings.php:1005
-#: ../../mod/settings.php:1006 ../../mod/settings.php:1007
-#: ../../mod/settings.php:1008 ../../mod/register.php:237
+#: ../../mod/api.php:105 ../../mod/dfrn_request.php:836
+#: ../../mod/settings.php:934 ../../mod/settings.php:940
+#: ../../mod/settings.php:948 ../../mod/settings.php:952
+#: ../../mod/settings.php:957 ../../mod/settings.php:963
+#: ../../mod/settings.php:969 ../../mod/settings.php:975
+#: ../../mod/settings.php:1005 ../../mod/settings.php:1006
+#: ../../mod/settings.php:1007 ../../mod/settings.php:1008
+#: ../../mod/settings.php:1009 ../../mod/register.php:237
 #: ../../mod/profiles.php:584
 msgid "Yes"
 msgstr "Tak"
 
-#: ../../mod/api.php:106 ../../mod/dfrn_request.php:836
-#: ../../mod/settings.php:933 ../../mod/settings.php:939
-#: ../../mod/settings.php:947 ../../mod/settings.php:951
-#: ../../mod/settings.php:956 ../../mod/settings.php:962
-#: ../../mod/settings.php:968 ../../mod/settings.php:974
-#: ../../mod/settings.php:1004 ../../mod/settings.php:1005
-#: ../../mod/settings.php:1006 ../../mod/settings.php:1007
-#: ../../mod/settings.php:1008 ../../mod/register.php:238
+#: ../../mod/api.php:106 ../../mod/dfrn_request.php:837
+#: ../../mod/settings.php:934 ../../mod/settings.php:940
+#: ../../mod/settings.php:948 ../../mod/settings.php:952
+#: ../../mod/settings.php:957 ../../mod/settings.php:963
+#: ../../mod/settings.php:969 ../../mod/settings.php:975
+#: ../../mod/settings.php:1005 ../../mod/settings.php:1006
+#: ../../mod/settings.php:1007 ../../mod/settings.php:1008
+#: ../../mod/settings.php:1009 ../../mod/register.php:238
 #: ../../mod/profiles.php:585
 msgid "No"
 msgstr "Nie"
 
-#: ../../mod/photos.php:51 ../../boot.php:1741
+#: ../../mod/photos.php:51 ../../boot.php:1784
 msgid "Photo Albums"
 msgstr "Albumy zdjęć"
 
 #: ../../mod/photos.php:59 ../../mod/photos.php:154 ../../mod/photos.php:1009
-#: ../../mod/photos.php:1092 ../../mod/photos.php:1107
-#: ../../mod/photos.php:1562 ../../mod/photos.php:1574
-#: ../../addon/communityhome/communityhome.php:110
-#: ../../view/theme/diabook/theme.php:492
+#: ../../mod/photos.php:1102 ../../mod/photos.php:1125
+#: ../../mod/photos.php:1626 ../../mod/photos.php:1638
+#: ../../addon/communityhome/communityhome.php:112
+#: ../../view/theme/diabook/theme.php:493
 #: ../../addon.old/communityhome/communityhome.php:110
 msgid "Contact Photos"
 msgstr "Zdjęcia kontaktu"
 
-#: ../../mod/photos.php:66 ../../mod/photos.php:1123 ../../mod/photos.php:1612
+#: ../../mod/photos.php:66 ../../mod/photos.php:1141 ../../mod/photos.php:1685
 msgid "Upload New Photos"
 msgstr "Wyślij nowe zdjęcie"
 
@@ -476,13 +477,13 @@ msgstr "wszyscy"
 msgid "Contact information unavailable"
 msgstr "Informacje o kontakcie nie dostępne."
 
-#: ../../mod/photos.php:154 ../../mod/photos.php:676 ../../mod/photos.php:1092
-#: ../../mod/photos.php:1107 ../../mod/profile_photo.php:74
+#: ../../mod/photos.php:154 ../../mod/photos.php:676 ../../mod/photos.php:1102
+#: ../../mod/photos.php:1125 ../../mod/profile_photo.php:74
 #: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88
 #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
 #: ../../mod/profile_photo.php:305
-#: ../../addon/communityhome/communityhome.php:111
-#: ../../view/theme/diabook/theme.php:493 ../../include/user.php:324
+#: ../../addon/communityhome/communityhome.php:113
+#: ../../view/theme/diabook/theme.php:494 ../../include/user.php:324
 #: ../../include/user.php:331 ../../include/user.php:338
 #: ../../addon.old/communityhome/communityhome.php:111
 msgid "Profile Photos"
@@ -492,11 +493,11 @@ msgstr "Zdjęcia profilowe"
 msgid "Album not found."
 msgstr "Album nie znaleziony"
 
-#: ../../mod/photos.php:182 ../../mod/photos.php:1101
+#: ../../mod/photos.php:182 ../../mod/photos.php:1119
 msgid "Delete Album"
 msgstr "Usuń album"
 
-#: ../../mod/photos.php:245 ../../mod/photos.php:1364
+#: ../../mod/photos.php:245 ../../mod/photos.php:1403
 msgid "Delete Photo"
 msgstr "Usuń zdjęcie"
 
@@ -529,7 +530,7 @@ msgid "Image upload failed."
 msgstr "Przesyłanie obrazu nie powiodło się"
 
 #: ../../mod/photos.php:865 ../../mod/community.php:18
-#: ../../mod/dfrn_request.php:760 ../../mod/viewcontacts.php:17
+#: ../../mod/dfrn_request.php:761 ../../mod/viewcontacts.php:17
 #: ../../mod/display.php:7 ../../mod/search.php:89 ../../mod/directory.php:31
 #: ../../addon/forumdirectory/forumdirectory.php:53
 msgid "Public access denied."
@@ -548,157 +549,157 @@ msgstr "Dostęp do tego obiektu jest ograniczony."
 msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
 msgstr ""
 
-#: ../../mod/photos.php:1043
+#: ../../mod/photos.php:1053
 msgid "Upload Photos"
 msgstr "Prześlij zdjęcia"
 
-#: ../../mod/photos.php:1047 ../../mod/photos.php:1096
+#: ../../mod/photos.php:1057 ../../mod/photos.php:1114
 msgid "New album name: "
 msgstr "Nazwa nowego albumu:"
 
-#: ../../mod/photos.php:1048
+#: ../../mod/photos.php:1058
 msgid "or existing album name: "
 msgstr "lub istniejąca nazwa albumu:"
 
-#: ../../mod/photos.php:1049
+#: ../../mod/photos.php:1059
 msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: ../../mod/photos.php:1051 ../../mod/photos.php:1359
+#: ../../mod/photos.php:1061 ../../mod/photos.php:1398
 msgid "Permissions"
 msgstr "Uprawnienia"
 
-#: ../../mod/photos.php:1111
+#: ../../mod/photos.php:1129
 msgid "Edit Album"
 msgstr "Edytuj album"
 
-#: ../../mod/photos.php:1117
+#: ../../mod/photos.php:1135
 msgid "Show Newest First"
 msgstr "Najpierw pokaż najnowsze"
 
-#: ../../mod/photos.php:1119
+#: ../../mod/photos.php:1137
 msgid "Show Oldest First"
 msgstr "Najpierw pokaż najstarsze"
 
-#: ../../mod/photos.php:1143 ../../mod/photos.php:1595
+#: ../../mod/photos.php:1170 ../../mod/photos.php:1668
 msgid "View Photo"
 msgstr "Zobacz zdjęcie"
 
-#: ../../mod/photos.php:1178
+#: ../../mod/photos.php:1205
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "Odmowa dostępu. Dostęp do tych danych może być ograniczony."
 
-#: ../../mod/photos.php:1180
+#: ../../mod/photos.php:1207
 msgid "Photo not available"
 msgstr "Zdjęcie niedostępne"
 
-#: ../../mod/photos.php:1236
+#: ../../mod/photos.php:1263
 msgid "View photo"
 msgstr "Zobacz zdjęcie"
 
-#: ../../mod/photos.php:1236
+#: ../../mod/photos.php:1263
 msgid "Edit photo"
 msgstr "Edytuj zdjęcie"
 
-#: ../../mod/photos.php:1237
+#: ../../mod/photos.php:1264
 msgid "Use as profile photo"
 msgstr "Ustaw jako zdjęcie profilowe"
 
-#: ../../mod/photos.php:1243 ../../mod/content.php:603
+#: ../../mod/photos.php:1270 ../../mod/content.php:620
 #: ../../object/Item.php:105
 msgid "Private Message"
 msgstr "Wiadomość prywatna"
 
-#: ../../mod/photos.php:1262
+#: ../../mod/photos.php:1289
 msgid "View Full Size"
 msgstr "Zobacz w pełnym rozmiarze"
 
-#: ../../mod/photos.php:1336
+#: ../../mod/photos.php:1363
 msgid "Tags: "
 msgstr "Tagi:"
 
-#: ../../mod/photos.php:1339
+#: ../../mod/photos.php:1366
 msgid "[Remove any tag]"
 msgstr "[Usunąć znacznik]"
 
-#: ../../mod/photos.php:1349
+#: ../../mod/photos.php:1388
 msgid "Rotate CW (right)"
 msgstr ""
 
-#: ../../mod/photos.php:1350
+#: ../../mod/photos.php:1389
 msgid "Rotate CCW (left)"
 msgstr ""
 
-#: ../../mod/photos.php:1352
+#: ../../mod/photos.php:1391
 msgid "New album name"
 msgstr "Nazwa nowego albumu"
 
-#: ../../mod/photos.php:1355
+#: ../../mod/photos.php:1394
 msgid "Caption"
 msgstr "Zawartość"
 
-#: ../../mod/photos.php:1357
+#: ../../mod/photos.php:1396
 msgid "Add a Tag"
 msgstr "Dodaj tag"
 
-#: ../../mod/photos.php:1361
+#: ../../mod/photos.php:1400
 msgid ""
 "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr "Przykładowo: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 
-#: ../../mod/photos.php:1381 ../../mod/content.php:667
+#: ../../mod/photos.php:1420 ../../mod/content.php:684
 #: ../../object/Item.php:203
 msgid "I like this (toggle)"
 msgstr "Lubię to (zmień)"
 
-#: ../../mod/photos.php:1382 ../../mod/content.php:668
+#: ../../mod/photos.php:1421 ../../mod/content.php:685
 #: ../../object/Item.php:204
 msgid "I don't like this (toggle)"
 msgstr "Nie lubię (zmień)"
 
-#: ../../mod/photos.php:1383 ../../include/conversation.php:969
+#: ../../mod/photos.php:1422 ../../include/conversation.php:1005
 msgid "Share"
 msgstr "Podziel się"
 
-#: ../../mod/photos.php:1384 ../../mod/editpost.php:121
-#: ../../mod/content.php:482 ../../mod/content.php:848
+#: ../../mod/photos.php:1423 ../../mod/editpost.php:121
+#: ../../mod/content.php:499 ../../mod/content.php:883
 #: ../../mod/wallmessage.php:152 ../../mod/message.php:300
-#: ../../mod/message.php:488 ../../include/conversation.php:624
-#: ../../include/conversation.php:988 ../../object/Item.php:270
+#: ../../mod/message.php:528 ../../include/conversation.php:645
+#: ../../include/conversation.php:1024 ../../object/Item.php:287
 msgid "Please wait"
 msgstr "Proszę czekać"
 
-#: ../../mod/photos.php:1400 ../../mod/photos.php:1444
-#: ../../mod/photos.php:1516 ../../mod/content.php:690
-#: ../../object/Item.php:574
+#: ../../mod/photos.php:1439 ../../mod/photos.php:1483
+#: ../../mod/photos.php:1566 ../../mod/content.php:707
+#: ../../object/Item.php:600
 msgid "This is you"
 msgstr "To jesteś ty"
 
-#: ../../mod/photos.php:1402 ../../mod/photos.php:1446
-#: ../../mod/photos.php:1518 ../../mod/content.php:692 ../../boot.php:608
-#: ../../object/Item.php:267 ../../object/Item.php:576
+#: ../../mod/photos.php:1441 ../../mod/photos.php:1485
+#: ../../mod/photos.php:1568 ../../mod/content.php:709 ../../boot.php:635
+#: ../../object/Item.php:284 ../../object/Item.php:602
 msgid "Comment"
 msgstr "Komentarz"
 
-#: ../../mod/photos.php:1404 ../../mod/photos.php:1448
-#: ../../mod/photos.php:1520 ../../mod/editpost.php:142
-#: ../../mod/content.php:702 ../../include/conversation.php:1006
-#: ../../object/Item.php:586
+#: ../../mod/photos.php:1443 ../../mod/photos.php:1487
+#: ../../mod/photos.php:1570 ../../mod/editpost.php:142
+#: ../../mod/content.php:719 ../../include/conversation.php:1042
+#: ../../object/Item.php:612
 msgid "Preview"
 msgstr "Podgląd"
 
-#: ../../mod/photos.php:1488 ../../mod/content.php:439
-#: ../../mod/content.php:724 ../../mod/settings.php:622
-#: ../../mod/group.php:168 ../../mod/admin.php:699
+#: ../../mod/photos.php:1527 ../../mod/content.php:439
+#: ../../mod/content.php:741 ../../mod/settings.php:623
+#: ../../mod/group.php:171 ../../mod/admin.php:735
 #: ../../include/conversation.php:569 ../../object/Item.php:119
 msgid "Delete"
 msgstr "Usuń"
 
-#: ../../mod/photos.php:1601
+#: ../../mod/photos.php:1674
 msgid "View Album"
 msgstr "Zobacz album"
 
-#: ../../mod/photos.php:1610
+#: ../../mod/photos.php:1683
 msgid "Recent Photos"
 msgstr "Ostatnio dodane zdjęcia"
 
@@ -706,7 +707,7 @@ msgstr "Ostatnio dodane zdjęcia"
 msgid "Not available."
 msgstr "Niedostępne."
 
-#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93
+#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:94
 #: ../../include/nav.php:101
 msgid "Community"
 msgstr "Społeczność"
@@ -756,96 +757,96 @@ msgstr "Artykuł nie znaleziony"
 msgid "Edit post"
 msgstr "Edytuj post"
 
-#: ../../mod/editpost.php:91 ../../include/conversation.php:955
+#: ../../mod/editpost.php:91 ../../include/conversation.php:991
 msgid "Post to Email"
 msgstr "Wyślij poprzez email"
 
-#: ../../mod/editpost.php:106 ../../mod/content.php:711
-#: ../../mod/settings.php:621 ../../object/Item.php:109
+#: ../../mod/editpost.php:106 ../../mod/content.php:728
+#: ../../mod/settings.php:622 ../../object/Item.php:109
 msgid "Edit"
 msgstr "Edytuj"
 
 #: ../../mod/editpost.php:107 ../../mod/wallmessage.php:150
-#: ../../mod/message.php:298 ../../mod/message.php:485
-#: ../../include/conversation.php:970
+#: ../../mod/message.php:298 ../../mod/message.php:525
+#: ../../include/conversation.php:1006
 msgid "Upload photo"
 msgstr "Wyślij zdjęcie"
 
-#: ../../mod/editpost.php:108 ../../include/conversation.php:971
+#: ../../mod/editpost.php:108 ../../include/conversation.php:1007
 msgid "upload photo"
 msgstr "dodaj zdjęcie"
 
-#: ../../mod/editpost.php:109 ../../include/conversation.php:972
+#: ../../mod/editpost.php:109 ../../include/conversation.php:1008
 msgid "Attach file"
 msgstr "Przyłącz plik"
 
-#: ../../mod/editpost.php:110 ../../include/conversation.php:973
+#: ../../mod/editpost.php:110 ../../include/conversation.php:1009
 msgid "attach file"
 msgstr "załącz plik"
 
 #: ../../mod/editpost.php:111 ../../mod/wallmessage.php:151
-#: ../../mod/message.php:299 ../../mod/message.php:486
-#: ../../include/conversation.php:974
+#: ../../mod/message.php:299 ../../mod/message.php:526
+#: ../../include/conversation.php:1010
 msgid "Insert web link"
 msgstr "Wstaw link"
 
-#: ../../mod/editpost.php:112 ../../include/conversation.php:975
+#: ../../mod/editpost.php:112 ../../include/conversation.php:1011
 msgid "web link"
 msgstr ""
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:976
+#: ../../mod/editpost.php:113 ../../include/conversation.php:1012
 msgid "Insert video link"
 msgstr "Wstaw link wideo"
 
-#: ../../mod/editpost.php:114 ../../include/conversation.php:977
+#: ../../mod/editpost.php:114 ../../include/conversation.php:1013
 msgid "video link"
 msgstr "link do filmu"
 
-#: ../../mod/editpost.php:115 ../../include/conversation.php:978
+#: ../../mod/editpost.php:115 ../../include/conversation.php:1014
 msgid "Insert audio link"
 msgstr "Wstaw link audio"
 
-#: ../../mod/editpost.php:116 ../../include/conversation.php:979
+#: ../../mod/editpost.php:116 ../../include/conversation.php:1015
 msgid "audio link"
 msgstr "Link audio"
 
-#: ../../mod/editpost.php:117 ../../include/conversation.php:980
+#: ../../mod/editpost.php:117 ../../include/conversation.php:1016
 msgid "Set your location"
 msgstr "Ustaw swoje położenie"
 
-#: ../../mod/editpost.php:118 ../../include/conversation.php:981
+#: ../../mod/editpost.php:118 ../../include/conversation.php:1017
 msgid "set location"
 msgstr "wybierz lokalizację"
 
-#: ../../mod/editpost.php:119 ../../include/conversation.php:982
+#: ../../mod/editpost.php:119 ../../include/conversation.php:1018
 msgid "Clear browser location"
 msgstr "Wyczyść położenie przeglądarki"
 
-#: ../../mod/editpost.php:120 ../../include/conversation.php:983
+#: ../../mod/editpost.php:120 ../../include/conversation.php:1019
 msgid "clear location"
 msgstr "wyczyść lokalizację"
 
-#: ../../mod/editpost.php:122 ../../include/conversation.php:989
+#: ../../mod/editpost.php:122 ../../include/conversation.php:1025
 msgid "Permission settings"
 msgstr "Ustawienia uprawnień"
 
-#: ../../mod/editpost.php:130 ../../include/conversation.php:998
+#: ../../mod/editpost.php:130 ../../include/conversation.php:1034
 msgid "CC: email addresses"
 msgstr "CC: adresy e-mail"
 
-#: ../../mod/editpost.php:131 ../../include/conversation.php:999
+#: ../../mod/editpost.php:131 ../../include/conversation.php:1035
 msgid "Public post"
 msgstr "Publiczny post"
 
-#: ../../mod/editpost.php:134 ../../include/conversation.php:985
+#: ../../mod/editpost.php:134 ../../include/conversation.php:1021
 msgid "Set title"
 msgstr "Ustaw tytuł"
 
-#: ../../mod/editpost.php:136 ../../include/conversation.php:987
+#: ../../mod/editpost.php:136 ../../include/conversation.php:1023
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../mod/editpost.php:137 ../../include/conversation.php:1001
+#: ../../mod/editpost.php:137 ../../include/conversation.php:1037
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Przykład: bob@example.com, mary@example.com"
 
@@ -853,19 +854,19 @@ msgstr "Przykład: bob@example.com, mary@example.com"
 msgid "This introduction has already been accepted."
 msgstr "To wprowadzenie zostało już zaakceptowane."
 
-#: ../../mod/dfrn_request.php:118 ../../mod/dfrn_request.php:512
+#: ../../mod/dfrn_request.php:118 ../../mod/dfrn_request.php:513
 msgid "Profile location is not valid or does not contain profile information."
 msgstr "Położenie profilu jest niepoprawne lub nie zawiera żadnych informacji."
 
-#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:517
+#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:518
 msgid "Warning: profile location has no identifiable owner name."
 msgstr "Ostrzeżenie: położenie profilu ma taką samą nazwę jak użytkownik."
 
-#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:519
+#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:520
 msgid "Warning: profile location has no profile photo."
 msgstr "Ostrzeżenie: położenie profilu nie zawiera zdjęcia."
 
-#: ../../mod/dfrn_request.php:128 ../../mod/dfrn_request.php:522
+#: ../../mod/dfrn_request.php:128 ../../mod/dfrn_request.php:523
 #, php-format
 msgid "%d required parameter was not found at the given location"
 msgid_plural "%d required parameters were not found at the given location"
@@ -906,140 +907,140 @@ msgstr "Niewłaściwy lokalizator "
 msgid "Invalid email address."
 msgstr "Nieprawidłowy adres email."
 
-#: ../../mod/dfrn_request.php:361
+#: ../../mod/dfrn_request.php:362
 msgid "This account has not been configured for email. Request failed."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:457
+#: ../../mod/dfrn_request.php:458
 msgid "Unable to resolve your name at the provided location."
 msgstr "Nie można rozpoznać twojej nazwy w przewidzianym miejscu."
 
-#: ../../mod/dfrn_request.php:470
+#: ../../mod/dfrn_request.php:471
 msgid "You have already introduced yourself here."
 msgstr "Już się tu przedstawiłeś."
 
-#: ../../mod/dfrn_request.php:474
+#: ../../mod/dfrn_request.php:475
 #, php-format
 msgid "Apparently you are already friends with %s."
 msgstr "Widocznie jesteście już znajomymi z %s"
 
-#: ../../mod/dfrn_request.php:495
+#: ../../mod/dfrn_request.php:496
 msgid "Invalid profile URL."
 msgstr "Zły adres URL profilu."
 
-#: ../../mod/dfrn_request.php:501 ../../include/follow.php:27
+#: ../../mod/dfrn_request.php:502 ../../include/follow.php:27
 msgid "Disallowed profile URL."
 msgstr "Nie dozwolony adres URL profilu."
 
-#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:124
+#: ../../mod/dfrn_request.php:571 ../../mod/contacts.php:124
 msgid "Failed to update contact record."
 msgstr "Aktualizacja nagrania kontaktu nie powiodła się."
 
-#: ../../mod/dfrn_request.php:591
+#: ../../mod/dfrn_request.php:592
 msgid "Your introduction has been sent."
 msgstr "Twoje dane zostały wysłane."
 
-#: ../../mod/dfrn_request.php:644
+#: ../../mod/dfrn_request.php:645
 msgid "Please login to confirm introduction."
 msgstr "Proszę zalogować się do potwierdzenia wstępu."
 
-#: ../../mod/dfrn_request.php:658
+#: ../../mod/dfrn_request.php:659
 msgid ""
 "Incorrect identity currently logged in. Please login to "
 "<strong>this</strong> profile."
 msgstr "Niepoprawna tożsamość obecnego użytkownika. Proszę zalogować się na <strong>tego</strong> użytkownika. "
 
-#: ../../mod/dfrn_request.php:669
+#: ../../mod/dfrn_request.php:670
 msgid "Hide this contact"
 msgstr "Ukryj kontakt"
 
-#: ../../mod/dfrn_request.php:672
+#: ../../mod/dfrn_request.php:673
 #, php-format
 msgid "Welcome home %s."
 msgstr "Welcome home %s."
 
-#: ../../mod/dfrn_request.php:673
+#: ../../mod/dfrn_request.php:674
 #, php-format
 msgid "Please confirm your introduction/connection request to %s."
 msgstr "Proszę potwierdzić swój wstęp/prośbę o połączenie do %s."
 
-#: ../../mod/dfrn_request.php:674
+#: ../../mod/dfrn_request.php:675
 msgid "Confirm"
 msgstr "Potwierdź"
 
-#: ../../mod/dfrn_request.php:715 ../../include/items.php:3356
+#: ../../mod/dfrn_request.php:716 ../../include/items.php:3366
 msgid "[Name Withheld]"
 msgstr "[Nazwa wstrzymana]"
 
-#: ../../mod/dfrn_request.php:810
+#: ../../mod/dfrn_request.php:811
 msgid ""
 "Please enter your 'Identity Address' from one of the following supported "
 "communications networks:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:826
+#: ../../mod/dfrn_request.php:827
 msgid "<strike>Connect as an email follower</strike> (Coming soon)"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:828
+#: ../../mod/dfrn_request.php:829
 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 ""
 
-#: ../../mod/dfrn_request.php:831
+#: ../../mod/dfrn_request.php:832
 msgid "Friend/Connection Request"
 msgstr "Przyjaciel/Prośba o połączenie"
 
-#: ../../mod/dfrn_request.php:832
+#: ../../mod/dfrn_request.php:833
 msgid ""
 "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
 "testuser@identi.ca"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:833
+#: ../../mod/dfrn_request.php:834
 msgid "Please answer the following:"
 msgstr "Proszę odpowiedzieć na poniższe:"
 
-#: ../../mod/dfrn_request.php:834
+#: ../../mod/dfrn_request.php:835
 #, php-format
 msgid "Does %s know you?"
 msgstr "Czy %s Cię zna?"
 
-#: ../../mod/dfrn_request.php:837
+#: ../../mod/dfrn_request.php:838
 msgid "Add a personal note:"
 msgstr "Dodaj osobistą notkę:"
 
-#: ../../mod/dfrn_request.php:839 ../../include/contact_selectors.php:76
+#: ../../mod/dfrn_request.php:840 ../../include/contact_selectors.php:76
 msgid "Friendica"
 msgstr "Friendica"
 
-#: ../../mod/dfrn_request.php:840
+#: ../../mod/dfrn_request.php:841
 msgid "StatusNet/Federated Social Web"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:681
+#: ../../mod/dfrn_request.php:842 ../../mod/settings.php:681
 #: ../../include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:842
+#: ../../mod/dfrn_request.php:843
 #, php-format
 msgid ""
 " - please do not use this form.  Instead, enter %s into your Diaspora search"
 " bar."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:843
+#: ../../mod/dfrn_request.php:844
 msgid "Your Identity Address:"
 msgstr "Twój zidentyfikowany adres:"
 
-#: ../../mod/dfrn_request.php:846
+#: ../../mod/dfrn_request.php:847
 msgid "Submit Request"
 msgstr "Wyślij zgłoszenie"
 
-#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:138
+#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:140
 msgid "Account settings"
 msgstr "Ustawienia konta"
 
@@ -1068,10 +1069,10 @@ msgid "Remove account"
 msgstr "Usuń konto"
 
 #: ../../mod/uexport.php:48 ../../mod/settings.php:74
-#: ../../mod/newmember.php:22 ../../mod/admin.php:788 ../../mod/admin.php:993
+#: ../../mod/newmember.php:22 ../../mod/admin.php:824 ../../mod/admin.php:1029
 #: ../../addon/dav/friendica/layout.fnk.php:225
-#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537
-#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:138
+#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:538
+#: ../../view/theme/diabook/theme.php:659 ../../include/nav.php:140
 #: ../../addon.old/dav/friendica/layout.fnk.php:225
 #: ../../addon.old/mathjax/mathjax.php:36
 msgid "Settings"
@@ -1120,240 +1121,269 @@ msgid ""
 "or mysql."
 msgstr "Może być konieczne zaimportowanie pliku \"database.sql\" ręcznie, używając phpmyadmin lub mysql."
 
-#: ../../mod/install.php:139 ../../mod/install.php:204
-#: ../../mod/install.php:488
+#: ../../mod/install.php:139 ../../mod/install.php:206
+#: ../../mod/install.php:506
 msgid "Please see the file \"INSTALL.txt\"."
 msgstr "Proszę przejrzeć plik \"INSTALL.txt\"."
 
-#: ../../mod/install.php:201
+#: ../../mod/install.php:203
 msgid "System check"
 msgstr "Sprawdzanie systemu"
 
-#: ../../mod/install.php:206
+#: ../../mod/install.php:208
 msgid "Check again"
 msgstr "Sprawdź ponownie"
 
-#: ../../mod/install.php:225
+#: ../../mod/install.php:227
 msgid "Database connection"
 msgstr "Połączenie z bazą danych"
 
-#: ../../mod/install.php:226
+#: ../../mod/install.php:228
 msgid ""
 "In order to install Friendica we need to know how to connect to your "
 "database."
 msgstr "W celu zainstalowania Friendica musimy wiedzieć jak połączyć się z twoją bazą danych."
 
-#: ../../mod/install.php:227
+#: ../../mod/install.php:229
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
 msgstr "Proszę skontaktuj się ze swoim dostawcą usług hostingowych bądź administratorem strony jeśli masz pytania co do tych ustawień ."
 
-#: ../../mod/install.php:228
+#: ../../mod/install.php:230
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
 msgstr "Wymieniona przez Ciebie baza danych powinna już istnieć. Jeżeli nie, utwórz ją przed kontynuacją."
 
-#: ../../mod/install.php:232
+#: ../../mod/install.php:234
 msgid "Database Server Name"
 msgstr "Baza danych - Nazwa serwera"
 
-#: ../../mod/install.php:233
+#: ../../mod/install.php:235
 msgid "Database Login Name"
 msgstr "Baza danych - Nazwa loginu"
 
-#: ../../mod/install.php:234
+#: ../../mod/install.php:236
 msgid "Database Login Password"
 msgstr "Baza danych - Hasło loginu"
 
-#: ../../mod/install.php:235
+#: ../../mod/install.php:237
 msgid "Database Name"
 msgstr "Baza danych - Nazwa"
 
-#: ../../mod/install.php:236 ../../mod/install.php:275
+#: ../../mod/install.php:238 ../../mod/install.php:277
 msgid "Site administrator email address"
 msgstr "Adres e-mail administratora strony"
 
-#: ../../mod/install.php:236 ../../mod/install.php:275
+#: ../../mod/install.php:238 ../../mod/install.php:277
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
 msgstr ""
 
-#: ../../mod/install.php:240 ../../mod/install.php:278
+#: ../../mod/install.php:242 ../../mod/install.php:280
 msgid "Please select a default timezone for your website"
 msgstr "Proszę wybrać domyślną strefę czasową dla swojej strony"
 
-#: ../../mod/install.php:265
+#: ../../mod/install.php:267
 msgid "Site settings"
 msgstr "Ustawienia strony"
 
-#: ../../mod/install.php:318
+#: ../../mod/install.php:320
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr "Nie można znaleźć wersji PHP komendy w serwerze PATH"
 
-#: ../../mod/install.php:319
+#: ../../mod/install.php:321
 msgid ""
 "If you don't have a command line version of PHP installed on server, you "
 "will not be able to run background polling via cron. See <a "
 "href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>"
 msgstr ""
 
-#: ../../mod/install.php:323
+#: ../../mod/install.php:325
 msgid "PHP executable path"
 msgstr ""
 
-#: ../../mod/install.php:323
+#: ../../mod/install.php:325
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr ""
 
-#: ../../mod/install.php:328
+#: ../../mod/install.php:330
 msgid "Command line PHP"
 msgstr ""
 
-#: ../../mod/install.php:337
+#: ../../mod/install.php:339
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr "Wersja linii poleceń PHP w twoim systemie nie ma aktywowanego \"register_argc_argv\"."
 
-#: ../../mod/install.php:338
+#: ../../mod/install.php:340
 msgid "This is required for message delivery to work."
 msgstr "To jest wymagane do dostarczenia wiadomości do pracy."
 
-#: ../../mod/install.php:340
+#: ../../mod/install.php:342
 msgid "PHP register_argc_argv"
 msgstr ""
 
-#: ../../mod/install.php:361
+#: ../../mod/install.php:363
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr "Błąd : funkcja systemu  \"openssl_pkey_new\"  nie jest  w stanie wygenerować klucza szyfrującego ."
 
-#: ../../mod/install.php:362
+#: ../../mod/install.php:364
 msgid ""
 "If running under Windows, please see "
 "\"http://www.php.net/manual/en/openssl.installation.php\"."
 msgstr "Jeśli korzystasz z Windowsa, proszę odwiedzić \"http://www.php.net/manual/en/openssl.installation.php\"."
 
-#: ../../mod/install.php:364
+#: ../../mod/install.php:366
 msgid "Generate encryption keys"
 msgstr ""
 
-#: ../../mod/install.php:371
+#: ../../mod/install.php:373
 msgid "libCurl PHP module"
 msgstr ""
 
-#: ../../mod/install.php:372
+#: ../../mod/install.php:374
 msgid "GD graphics PHP module"
 msgstr ""
 
-#: ../../mod/install.php:373
+#: ../../mod/install.php:375
 msgid "OpenSSL PHP module"
 msgstr ""
 
-#: ../../mod/install.php:374
+#: ../../mod/install.php:376
 msgid "mysqli PHP module"
 msgstr ""
 
-#: ../../mod/install.php:375
+#: ../../mod/install.php:377
 msgid "mb_string PHP module"
 msgstr ""
 
-#: ../../mod/install.php:380 ../../mod/install.php:382
+#: ../../mod/install.php:382 ../../mod/install.php:384
 msgid "Apache mod_rewrite module"
 msgstr ""
 
-#: ../../mod/install.php:380
+#: ../../mod/install.php:382
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr "Błąd: moduł Apache webserver mod-rewrite jest potrzebny, jednakże nie jest zainstalowany."
 
-#: ../../mod/install.php:388
+#: ../../mod/install.php:390
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "Błąd: libCURL PHP wymagany moduł, lecz nie zainstalowany."
 
-#: ../../mod/install.php:392
+#: ../../mod/install.php:394
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr "Błąd: moduł graficzny GD z PHP potrzebuje wsparcia technicznego JPEG, jednakże on nie jest zainstalowany."
 
-#: ../../mod/install.php:396
+#: ../../mod/install.php:398
 msgid "Error: openssl PHP module required but not installed."
 msgstr "Błąd: openssl PHP wymagany moduł, lecz nie zainstalowany."
 
-#: ../../mod/install.php:400
+#: ../../mod/install.php:402
 msgid "Error: mysqli PHP module required but not installed."
 msgstr "Błąd: mysqli PHP wymagany moduł, lecz nie zainstalowany."
 
-#: ../../mod/install.php:404
+#: ../../mod/install.php:406
 msgid "Error: mb_string PHP module required but not installed."
 msgstr "Błąd: moduł PHP mb_string  jest wymagany ale nie jest zainstalowany"
 
-#: ../../mod/install.php:421
+#: ../../mod/install.php:423
 msgid ""
 "The web installer needs to be able to create a file called \".htconfig.php\""
 " in the top folder of your web server and it is unable to do so."
 msgstr ""
 
-#: ../../mod/install.php:422
+#: ../../mod/install.php:424
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
 msgstr ""
 
-#: ../../mod/install.php:423
+#: ../../mod/install.php:425
 msgid ""
 "At the end of this procedure, we will give you a text to save in a file "
 "named .htconfig.php in your Friendica top folder."
 msgstr ""
 
-#: ../../mod/install.php:424
+#: ../../mod/install.php:426
 msgid ""
 "You can alternatively skip this procedure and perform a manual installation."
 " Please see the file \"INSTALL.txt\" for instructions."
 msgstr ""
 
-#: ../../mod/install.php:427
+#: ../../mod/install.php:429
 msgid ".htconfig.php is writable"
 msgstr ""
 
 #: ../../mod/install.php:439
 msgid ""
-"Url rewrite in .htaccess is not working. Check your server configuration."
+"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
+msgstr ""
+
+#: ../../mod/install.php:440
+msgid ""
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory view/smarty3/ under the Friendica top level "
+"folder."
 msgstr ""
 
 #: ../../mod/install.php:441
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has"
+" write access to this folder."
+msgstr ""
+
+#: ../../mod/install.php:442
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"view/smarty3/ only--not the template files (.tpl) that it contains."
+msgstr ""
+
+#: ../../mod/install.php:445
+msgid "view/smarty3 is writable"
+msgstr ""
+
+#: ../../mod/install.php:457
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
+msgstr ""
+
+#: ../../mod/install.php:459
 msgid "Url rewrite is working"
 msgstr ""
 
-#: ../../mod/install.php:451
+#: ../../mod/install.php:469
 msgid ""
 "The database configuration file \".htconfig.php\" could not be written. "
 "Please use the enclosed text to create a configuration file in your web "
 "server root."
-msgstr ""
+msgstr "Konfiguracja bazy danych pliku \".htconfig.php\" nie mogła zostać zapisana. Proszę użyć załączonego tekstu, aby utworzyć folder konfiguracyjny w sieci serwera."
 
-#: ../../mod/install.php:475
+#: ../../mod/install.php:493
 msgid "Errors encountered creating database tables."
 msgstr "Zostały napotkane błędy przy tworzeniu tabeli bazy danych."
 
-#: ../../mod/install.php:486
+#: ../../mod/install.php:504
 msgid "<h1>What next</h1>"
 msgstr ""
 
-#: ../../mod/install.php:487
+#: ../../mod/install.php:505
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the "
 "poller."
 msgstr ""
 
 #: ../../mod/localtime.php:12 ../../include/event.php:11
-#: ../../include/bb2diaspora.php:390
+#: ../../include/bb2diaspora.php:393
 msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
@@ -1419,7 +1449,7 @@ msgid "is interested in:"
 msgstr "interesuje się:"
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1216
+#: ../../include/contact_widgets.php:9 ../../boot.php:1250
 msgid "Connect"
 msgstr "Połącz"
 
@@ -1432,7 +1462,7 @@ msgid "Remote privacy information not available."
 msgstr "Dane prywatne nie są dostępne zdalnie "
 
 #: ../../mod/lockview.php:48
-#: ../../addon/remote_permissions/remote_permissions.php:123
+#: ../../addon/remote_permissions/remote_permissions.php:124
 msgid "Visible to:"
 msgstr "Widoczne dla:"
 
@@ -1448,29 +1478,29 @@ msgstr "Grupa jest pusta"
 msgid "Group: "
 msgstr "Grupa:"
 
-#: ../../mod/content.php:438 ../../mod/content.php:723
+#: ../../mod/content.php:438 ../../mod/content.php:740
 #: ../../include/conversation.php:568 ../../object/Item.php:118
 msgid "Select"
 msgstr "Wybierz"
 
-#: ../../mod/content.php:455 ../../mod/content.php:817
-#: ../../mod/content.php:818 ../../include/conversation.php:587
-#: ../../object/Item.php:235 ../../object/Item.php:236
+#: ../../mod/content.php:472 ../../mod/content.php:852
+#: ../../mod/content.php:853 ../../include/conversation.php:608
+#: ../../object/Item.php:252 ../../object/Item.php:253
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Pokaż %s's profil @ %s"
 
-#: ../../mod/content.php:465 ../../mod/content.php:829
-#: ../../include/conversation.php:607 ../../object/Item.php:249
+#: ../../mod/content.php:482 ../../mod/content.php:864
+#: ../../include/conversation.php:628 ../../object/Item.php:266
 #, php-format
 msgid "%s from %s"
 msgstr "%s od %s"
 
-#: ../../mod/content.php:480 ../../include/conversation.php:622
+#: ../../mod/content.php:497 ../../include/conversation.php:643
 msgid "View in context"
 msgstr "Zobacz w kontekście"
 
-#: ../../mod/content.php:586 ../../object/Item.php:289
+#: ../../mod/content.php:603 ../../object/Item.php:306
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
@@ -1478,107 +1508,107 @@ msgstr[0] " %d komentarz"
 msgstr[1] " %d komentarzy"
 msgstr[2] " %d komentarzy"
 
-#: ../../mod/content.php:588 ../../include/text.php:1446
-#: ../../object/Item.php:291 ../../object/Item.php:304
+#: ../../mod/content.php:605 ../../include/text.php:1503
+#: ../../object/Item.php:308 ../../object/Item.php:321
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] "komentarz"
 
-#: ../../mod/content.php:589 ../../addon/page/page.php:77
+#: ../../mod/content.php:606 ../../addon/page/page.php:77
 #: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119
-#: ../../include/contact_widgets.php:204 ../../boot.php:609
-#: ../../object/Item.php:292 ../../addon.old/page/page.php:77
+#: ../../include/contact_widgets.php:204 ../../boot.php:636
+#: ../../object/Item.php:309 ../../addon.old/page/page.php:77
 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119
 msgid "show more"
 msgstr "Pokaż więcej"
 
-#: ../../mod/content.php:667 ../../object/Item.php:203
+#: ../../mod/content.php:684 ../../object/Item.php:203
 msgid "like"
 msgstr "polub"
 
-#: ../../mod/content.php:668 ../../object/Item.php:204
+#: ../../mod/content.php:685 ../../object/Item.php:204
 msgid "dislike"
 msgstr "Nie lubię"
 
-#: ../../mod/content.php:670 ../../object/Item.php:206
+#: ../../mod/content.php:687 ../../object/Item.php:206
 msgid "Share this"
 msgstr "Udostępnij to"
 
-#: ../../mod/content.php:670 ../../object/Item.php:206
+#: ../../mod/content.php:687 ../../object/Item.php:206
 msgid "share"
 msgstr "udostępnij"
 
-#: ../../mod/content.php:694 ../../object/Item.php:578
+#: ../../mod/content.php:711 ../../object/Item.php:604
 msgid "Bold"
 msgstr "Pogrubienie"
 
-#: ../../mod/content.php:695 ../../object/Item.php:579
+#: ../../mod/content.php:712 ../../object/Item.php:605
 msgid "Italic"
 msgstr "Kursywa"
 
-#: ../../mod/content.php:696 ../../object/Item.php:580
+#: ../../mod/content.php:713 ../../object/Item.php:606
 msgid "Underline"
 msgstr "Podkreślenie"
 
-#: ../../mod/content.php:697 ../../object/Item.php:581
+#: ../../mod/content.php:714 ../../object/Item.php:607
 msgid "Quote"
 msgstr "Cytat"
 
-#: ../../mod/content.php:698 ../../object/Item.php:582
+#: ../../mod/content.php:715 ../../object/Item.php:608
 msgid "Code"
 msgstr "Kod"
 
-#: ../../mod/content.php:699 ../../object/Item.php:583
+#: ../../mod/content.php:716 ../../object/Item.php:609
 msgid "Image"
 msgstr "Obraz"
 
-#: ../../mod/content.php:700 ../../object/Item.php:584
+#: ../../mod/content.php:717 ../../object/Item.php:610
 msgid "Link"
 msgstr "Link"
 
-#: ../../mod/content.php:701 ../../object/Item.php:585
+#: ../../mod/content.php:718 ../../object/Item.php:611
 msgid "Video"
 msgstr "Video"
 
-#: ../../mod/content.php:736 ../../object/Item.php:182
+#: ../../mod/content.php:753 ../../object/Item.php:182
 msgid "add star"
 msgstr "dodaj gwiazdkę"
 
-#: ../../mod/content.php:737 ../../object/Item.php:183
+#: ../../mod/content.php:754 ../../object/Item.php:183
 msgid "remove star"
 msgstr "anuluj gwiazdkę"
 
-#: ../../mod/content.php:738 ../../object/Item.php:184
+#: ../../mod/content.php:755 ../../object/Item.php:184
 msgid "toggle star status"
 msgstr "włącz status gwiazdy"
 
-#: ../../mod/content.php:741 ../../object/Item.php:187
+#: ../../mod/content.php:758 ../../object/Item.php:187
 msgid "starred"
 msgstr ""
 
-#: ../../mod/content.php:742 ../../object/Item.php:192
+#: ../../mod/content.php:759 ../../object/Item.php:192
 msgid "add tag"
 msgstr "dodaj tag"
 
-#: ../../mod/content.php:746 ../../object/Item.php:122
+#: ../../mod/content.php:763 ../../object/Item.php:122
 msgid "save to folder"
 msgstr "zapisz w folderze"
 
-#: ../../mod/content.php:819 ../../object/Item.php:237
+#: ../../mod/content.php:854 ../../object/Item.php:254
 msgid "to"
 msgstr "do"
 
-#: ../../mod/content.php:820 ../../object/Item.php:239
+#: ../../mod/content.php:855 ../../object/Item.php:256
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../mod/content.php:821 ../../object/Item.php:240
+#: ../../mod/content.php:856 ../../object/Item.php:257
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:179
+#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:183
 #: ../../addon.old/communityhome/communityhome.php:179
 #, php-format
 msgid "Welcome to %s"
@@ -1588,13 +1618,13 @@ msgstr "Witamy w %s"
 msgid "Invalid request identifier."
 msgstr "Niewłaściwy identyfikator wymagania."
 
-#: ../../mod/notifications.php:35 ../../mod/notifications.php:164
-#: ../../mod/notifications.php:210
+#: ../../mod/notifications.php:35 ../../mod/notifications.php:165
+#: ../../mod/notifications.php:211
 msgid "Discard"
 msgstr "Odrzuć"
 
-#: ../../mod/notifications.php:51 ../../mod/notifications.php:163
-#: ../../mod/notifications.php:209 ../../mod/contacts.php:325
+#: ../../mod/notifications.php:51 ../../mod/notifications.php:164
+#: ../../mod/notifications.php:210 ../../mod/contacts.php:325
 #: ../../mod/contacts.php:379
 msgid "Ignore"
 msgstr "Ignoruj"
@@ -1611,7 +1641,7 @@ msgstr "Sieć"
 msgid "Personal"
 msgstr "Osobiste"
 
-#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87
+#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:88
 #: ../../include/nav.php:77 ../../include/nav.php:116
 msgid "Home"
 msgstr "Dom"
@@ -1633,139 +1663,139 @@ msgstr "Pokaż ignorowane żądania"
 msgid "Hide Ignored Requests"
 msgstr "Ukryj ignorowane żądania"
 
-#: ../../mod/notifications.php:148 ../../mod/notifications.php:194
+#: ../../mod/notifications.php:149 ../../mod/notifications.php:195
 msgid "Notification type: "
 msgstr "Typ zawiadomień:"
 
-#: ../../mod/notifications.php:149
+#: ../../mod/notifications.php:150
 msgid "Friend Suggestion"
 msgstr "Propozycja znajomych"
 
-#: ../../mod/notifications.php:151
+#: ../../mod/notifications.php:152
 #, php-format
 msgid "suggested by %s"
 msgstr "zaproponowane przez %s"
 
-#: ../../mod/notifications.php:156 ../../mod/notifications.php:203
+#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
 #: ../../mod/contacts.php:385
 msgid "Hide this contact from others"
 msgstr "Ukryj ten kontakt przed innymi"
 
-#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
+#: ../../mod/notifications.php:158 ../../mod/notifications.php:205
 msgid "Post a new friend activity"
 msgstr ""
 
-#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
+#: ../../mod/notifications.php:158 ../../mod/notifications.php:205
 msgid "if applicable"
 msgstr "jeśli odpowiednie"
 
-#: ../../mod/notifications.php:160 ../../mod/notifications.php:207
-#: ../../mod/admin.php:697
+#: ../../mod/notifications.php:161 ../../mod/notifications.php:208
+#: ../../mod/admin.php:733
 msgid "Approve"
 msgstr "Zatwierdź"
 
-#: ../../mod/notifications.php:180
+#: ../../mod/notifications.php:181
 msgid "Claims to be known to you: "
 msgstr "Twierdzi, że go znasz:"
 
-#: ../../mod/notifications.php:180
+#: ../../mod/notifications.php:181
 msgid "yes"
 msgstr "tak"
 
-#: ../../mod/notifications.php:180
+#: ../../mod/notifications.php:181
 msgid "no"
 msgstr "nie"
 
-#: ../../mod/notifications.php:187
+#: ../../mod/notifications.php:188
 msgid "Approve as: "
 msgstr "Zatwierdź jako:"
 
-#: ../../mod/notifications.php:188
+#: ../../mod/notifications.php:189
 msgid "Friend"
 msgstr "Znajomy"
 
-#: ../../mod/notifications.php:189
+#: ../../mod/notifications.php:190
 msgid "Sharer"
 msgstr ""
 
-#: ../../mod/notifications.php:189
+#: ../../mod/notifications.php:190
 msgid "Fan/Admirer"
 msgstr "Fan"
 
-#: ../../mod/notifications.php:195
+#: ../../mod/notifications.php:196
 msgid "Friend/Connect Request"
 msgstr "Prośba o dodanie do przyjaciół/powiązanych"
 
-#: ../../mod/notifications.php:195
+#: ../../mod/notifications.php:196
 msgid "New Follower"
 msgstr "Nowy obserwator"
 
-#: ../../mod/notifications.php:216
+#: ../../mod/notifications.php:217
 msgid "No introductions."
 msgstr "Brak wstępu."
 
-#: ../../mod/notifications.php:219 ../../include/nav.php:123
+#: ../../mod/notifications.php:220 ../../include/nav.php:123
 msgid "Notifications"
 msgstr "Powiadomienia"
 
-#: ../../mod/notifications.php:256 ../../mod/notifications.php:381
-#: ../../mod/notifications.php:468
+#: ../../mod/notifications.php:257 ../../mod/notifications.php:382
+#: ../../mod/notifications.php:469
 #, php-format
 msgid "%s liked %s's post"
 msgstr "%s polubił wpis %s"
 
-#: ../../mod/notifications.php:265 ../../mod/notifications.php:390
-#: ../../mod/notifications.php:477
+#: ../../mod/notifications.php:266 ../../mod/notifications.php:391
+#: ../../mod/notifications.php:478
 #, php-format
 msgid "%s disliked %s's post"
 msgstr "%s przestał lubić post %s"
 
-#: ../../mod/notifications.php:279 ../../mod/notifications.php:404
-#: ../../mod/notifications.php:491
+#: ../../mod/notifications.php:280 ../../mod/notifications.php:405
+#: ../../mod/notifications.php:492
 #, php-format
 msgid "%s is now friends with %s"
 msgstr "%s jest teraz znajomym %s"
 
-#: ../../mod/notifications.php:286 ../../mod/notifications.php:411
+#: ../../mod/notifications.php:287 ../../mod/notifications.php:412
 #, php-format
 msgid "%s created a new post"
 msgstr "%s dodał nowy wpis"
 
-#: ../../mod/notifications.php:287 ../../mod/notifications.php:412
-#: ../../mod/notifications.php:500
+#: ../../mod/notifications.php:288 ../../mod/notifications.php:413
+#: ../../mod/notifications.php:501
 #, php-format
 msgid "%s commented on %s's post"
 msgstr "%s skomentował wpis %s"
 
-#: ../../mod/notifications.php:301
+#: ../../mod/notifications.php:302
 msgid "No more network notifications."
 msgstr "Nie ma więcej powiadomień sieciowych"
 
-#: ../../mod/notifications.php:305
+#: ../../mod/notifications.php:306
 msgid "Network Notifications"
 msgstr "Powiadomienia z sieci"
 
-#: ../../mod/notifications.php:331 ../../mod/notify.php:61
+#: ../../mod/notifications.php:332 ../../mod/notify.php:61
 msgid "No more system notifications."
 msgstr "Nie ma więcej powiadomień systemowych."
 
-#: ../../mod/notifications.php:335 ../../mod/notify.php:65
+#: ../../mod/notifications.php:336 ../../mod/notify.php:65
 msgid "System Notifications"
 msgstr "Powiadomienia systemowe"
 
-#: ../../mod/notifications.php:426
+#: ../../mod/notifications.php:427
 msgid "No more personal notifications."
 msgstr "Nie ma więcej powiadomień osobistych"
 
-#: ../../mod/notifications.php:430
+#: ../../mod/notifications.php:431
 msgid "Personal Notifications"
 msgstr "Prywatne powiadomienia"
 
-#: ../../mod/notifications.php:507
+#: ../../mod/notifications.php:508
 msgid "No more home notifications."
 msgstr "Nie ma więcej powiadomień domu"
 
-#: ../../mod/notifications.php:511
+#: ../../mod/notifications.php:512
 msgid "Home Notifications"
 msgstr "Powiadomienia z instancji"
 
@@ -1862,12 +1892,12 @@ msgid "View all contacts"
 msgstr "Zobacz wszystkie kontakty"
 
 #: ../../mod/contacts.php:319 ../../mod/contacts.php:378
-#: ../../mod/admin.php:701
+#: ../../mod/admin.php:737
 msgid "Unblock"
 msgstr "Odblokuj"
 
 #: ../../mod/contacts.php:319 ../../mod/contacts.php:378
-#: ../../mod/admin.php:700
+#: ../../mod/admin.php:736
 msgid "Block"
 msgstr "Zablokuj"
 
@@ -1964,7 +1994,7 @@ msgstr "Ostatnia aktualizacja:"
 msgid "Update public posts"
 msgstr ""
 
-#: ../../mod/contacts.php:375 ../../mod/admin.php:1173
+#: ../../mod/contacts.php:375 ../../mod/admin.php:1209
 msgid "Update now"
 msgstr "Aktualizuj teraz"
 
@@ -1993,7 +2023,7 @@ msgstr "Sugestie"
 msgid "Suggest potential friends"
 msgstr "Sugerowani znajomi"
 
-#: ../../mod/contacts.php:444 ../../mod/group.php:191
+#: ../../mod/contacts.php:444 ../../mod/group.php:194
 msgid "All Contacts"
 msgstr "Wszystkie kontakty"
 
@@ -2057,8 +2087,8 @@ msgstr "jesteś fanem"
 msgid "Edit contact"
 msgstr "Edytuj kontakt"
 
-#: ../../mod/contacts.php:575 ../../view/theme/diabook/theme.php:89
-#: ../../include/nav.php:142
+#: ../../mod/contacts.php:575 ../../view/theme/diabook/theme.php:90
+#: ../../include/nav.php:144
 msgid "Contacts"
 msgstr "Kontakty"
 
@@ -2094,10 +2124,10 @@ msgstr "Prośba o reset hasła na %s"
 #: ../../mod/register.php:91 ../../mod/register.php:145
 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752
 #: ../../addon/facebook/facebook.php:702
-#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:777
+#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:805
 #: ../../addon/public_server/public_server.php:62
-#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3365
-#: ../../boot.php:824 ../../addon.old/facebook/facebook.php:702
+#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3375
+#: ../../boot.php:852 ../../addon.old/facebook/facebook.php:702
 #: ../../addon.old/facebook/facebook.php:1200
 #: ../../addon.old/fbpost/fbpost.php:661
 #: ../../addon.old/public_server/public_server.php:62
@@ -2111,7 +2141,7 @@ msgid ""
 "Password reset failed."
 msgstr "Prośba nie może być zweryfikowana. (Mogłeś już ją poprzednio wysłać.) Reset hasła nie powiódł się."
 
-#: ../../mod/lostpass.php:83 ../../boot.php:963
+#: ../../mod/lostpass.php:83 ../../boot.php:990
 msgid "Password Reset"
 msgstr "Zresetuj hasło"
 
@@ -2163,69 +2193,69 @@ msgstr ""
 msgid "Missing some important data!"
 msgstr "Brakuje ważnych danych!"
 
-#: ../../mod/settings.php:121 ../../mod/settings.php:585
+#: ../../mod/settings.php:121 ../../mod/settings.php:586
 msgid "Update"
 msgstr "Zaktualizuj"
 
-#: ../../mod/settings.php:226
+#: ../../mod/settings.php:227
 msgid "Failed to connect with email account using the settings provided."
 msgstr "Połączenie z kontem email używając wybranych ustawień nie powiodło się."
 
-#: ../../mod/settings.php:231
+#: ../../mod/settings.php:232
 msgid "Email settings updated."
 msgstr "Zaktualizowano ustawienia email."
 
-#: ../../mod/settings.php:246
+#: ../../mod/settings.php:247
 msgid "Features updated"
 msgstr ""
 
-#: ../../mod/settings.php:306
+#: ../../mod/settings.php:307
 msgid "Passwords do not match. Password unchanged."
 msgstr "Hasło nie pasuje. Hasło nie zmienione."
 
-#: ../../mod/settings.php:311
+#: ../../mod/settings.php:312
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Brak hasła niedozwolony. Hasło nie zmienione."
 
-#: ../../mod/settings.php:322
+#: ../../mod/settings.php:323
 msgid "Password changed."
 msgstr "Hasło zostało zmianione."
 
-#: ../../mod/settings.php:324
+#: ../../mod/settings.php:325
 msgid "Password update failed. Please try again."
 msgstr "Aktualizacja hasła nie powiodła się. Proszę spróbować ponownie."
 
-#: ../../mod/settings.php:389
+#: ../../mod/settings.php:390
 msgid " Please use a shorter name."
 msgstr "Proszę użyć krótszej nazwy."
 
-#: ../../mod/settings.php:391
+#: ../../mod/settings.php:392
 msgid " Name too short."
 msgstr "Za krótka nazwa."
 
-#: ../../mod/settings.php:397
+#: ../../mod/settings.php:398
 msgid " Not valid email."
 msgstr "Zły email."
 
-#: ../../mod/settings.php:399
+#: ../../mod/settings.php:400
 msgid " Cannot change to that email."
 msgstr "Nie mogę zmienić na ten email."
 
-#: ../../mod/settings.php:453
+#: ../../mod/settings.php:454
 msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr ""
 
-#: ../../mod/settings.php:457
+#: ../../mod/settings.php:458
 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr ""
 
-#: ../../mod/settings.php:487 ../../addon/facebook/facebook.php:495
+#: ../../mod/settings.php:488 ../../addon/facebook/facebook.php:495
 #: ../../addon/fbpost/fbpost.php:151
-#: ../../addon/remote_permissions/remote_permissions.php:204
+#: ../../addon/remote_permissions/remote_permissions.php:205
 #: ../../addon/impressum/impressum.php:78
 #: ../../addon/openstreetmap/openstreetmap.php:80
 #: ../../addon/altpager/altpager.php:107 ../../addon/mathjax/mathjax.php:66
-#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:501
+#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:504
 #: ../../addon.old/facebook/facebook.php:495
 #: ../../addon.old/fbpost/fbpost.php:144
 #: ../../addon.old/impressum/impressum.php:78
@@ -2235,69 +2265,69 @@ msgstr ""
 msgid "Settings updated."
 msgstr "Zaktualizowano ustawienia."
 
-#: ../../mod/settings.php:558 ../../mod/settings.php:584
-#: ../../mod/settings.php:620
+#: ../../mod/settings.php:559 ../../mod/settings.php:585
+#: ../../mod/settings.php:621
 msgid "Add application"
 msgstr "Dodaj aplikacje"
 
-#: ../../mod/settings.php:562 ../../mod/settings.php:588
-#: ../../addon/statusnet/statusnet.php:694
+#: ../../mod/settings.php:563 ../../mod/settings.php:589
+#: ../../addon/statusnet/statusnet.php:697
 #: ../../addon.old/statusnet/statusnet.php:570
 msgid "Consumer Key"
 msgstr "Klucz konsumenta"
 
-#: ../../mod/settings.php:563 ../../mod/settings.php:589
-#: ../../addon/statusnet/statusnet.php:693
+#: ../../mod/settings.php:564 ../../mod/settings.php:590
+#: ../../addon/statusnet/statusnet.php:696
 #: ../../addon.old/statusnet/statusnet.php:569
 msgid "Consumer Secret"
 msgstr "Sekret konsumenta"
 
-#: ../../mod/settings.php:564 ../../mod/settings.php:590
+#: ../../mod/settings.php:565 ../../mod/settings.php:591
 msgid "Redirect"
 msgstr "Przekierowanie"
 
-#: ../../mod/settings.php:565 ../../mod/settings.php:591
+#: ../../mod/settings.php:566 ../../mod/settings.php:592
 msgid "Icon url"
 msgstr "Adres ikony"
 
-#: ../../mod/settings.php:576
+#: ../../mod/settings.php:577
 msgid "You can't edit this application."
 msgstr "Nie możesz edytować tej aplikacji."
 
-#: ../../mod/settings.php:619
+#: ../../mod/settings.php:620
 msgid "Connected Apps"
 msgstr "Powiązane aplikacje"
 
-#: ../../mod/settings.php:623
+#: ../../mod/settings.php:624
 msgid "Client key starts with"
 msgstr ""
 
-#: ../../mod/settings.php:624
+#: ../../mod/settings.php:625
 msgid "No name"
 msgstr "Bez nazwy"
 
-#: ../../mod/settings.php:625
+#: ../../mod/settings.php:626
 msgid "Remove authorization"
 msgstr "Odwołaj upoważnienie"
 
-#: ../../mod/settings.php:637
+#: ../../mod/settings.php:638
 msgid "No Plugin settings configured"
 msgstr "Ustawienia wtyczki nieskonfigurowane"
 
-#: ../../mod/settings.php:645 ../../addon/widgets/widgets.php:123
+#: ../../mod/settings.php:646 ../../addon/widgets/widgets.php:124
 #: ../../addon.old/widgets/widgets.php:123
 msgid "Plugin Settings"
 msgstr "Ustawienia wtyczki"
 
-#: ../../mod/settings.php:659
+#: ../../mod/settings.php:660
 msgid "Off"
 msgstr ""
 
-#: ../../mod/settings.php:659
+#: ../../mod/settings.php:660
 msgid "On"
 msgstr ""
 
-#: ../../mod/settings.php:667
+#: ../../mod/settings.php:668
 msgid "Additional Features"
 msgstr ""
 
@@ -2322,375 +2352,375 @@ msgstr ""
 msgid "Email access is disabled on this site."
 msgstr "Dostęp do e-maila nie jest w pełni sprawny na tej stronie"
 
-#: ../../mod/settings.php:720
+#: ../../mod/settings.php:721
 msgid "Connector Settings"
 msgstr "Ustawienia konektora"
 
-#: ../../mod/settings.php:725
+#: ../../mod/settings.php:726
 msgid "Email/Mailbox Setup"
 msgstr "Ustawienia  emaila/skrzynki mailowej"
 
-#: ../../mod/settings.php:726
+#: ../../mod/settings.php:727
 msgid ""
 "If you wish to communicate with email contacts using this service "
 "(optional), please specify how to connect to your mailbox."
-msgstr ""
+msgstr "Jeżeli życzysz sobie komunikowania z kontaktami email używając tego serwisu (opcjonalne), opisz jak połaczyć się z Twoją skrzynką email."
 
-#: ../../mod/settings.php:727
+#: ../../mod/settings.php:728
 msgid "Last successful email check:"
 msgstr "Ostatni sprawdzony e-mail:"
 
-#: ../../mod/settings.php:729
+#: ../../mod/settings.php:730
 msgid "IMAP server name:"
 msgstr "Nazwa serwera IMAP:"
 
-#: ../../mod/settings.php:730
+#: ../../mod/settings.php:731
 msgid "IMAP port:"
 msgstr "Port IMAP:"
 
-#: ../../mod/settings.php:731
+#: ../../mod/settings.php:732
 msgid "Security:"
 msgstr "Ochrona:"
 
-#: ../../mod/settings.php:731 ../../mod/settings.php:736
+#: ../../mod/settings.php:732 ../../mod/settings.php:737
 #: ../../addon/fbpost/fbpost.php:247 ../../addon/fbpost/fbpost.php:249
 #: ../../addon/dav/common/wdcal_edit.inc.php:191
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:191
 msgid "None"
 msgstr "Brak"
 
-#: ../../mod/settings.php:732
+#: ../../mod/settings.php:733
 msgid "Email login name:"
 msgstr "Login emaila:"
 
-#: ../../mod/settings.php:733
+#: ../../mod/settings.php:734
 msgid "Email password:"
 msgstr "Hasło emaila:"
 
-#: ../../mod/settings.php:734
+#: ../../mod/settings.php:735
 msgid "Reply-to address:"
 msgstr "Odpowiedz na adres:"
 
-#: ../../mod/settings.php:735
+#: ../../mod/settings.php:736
 msgid "Send public posts to all email contacts:"
 msgstr "Wyślij publiczny post do wszystkich kontaktów e-mail"
 
-#: ../../mod/settings.php:736
+#: ../../mod/settings.php:737
 msgid "Action after import:"
 msgstr "Akcja po zaimportowaniu:"
 
-#: ../../mod/settings.php:736
+#: ../../mod/settings.php:737
 msgid "Mark as seen"
 msgstr "Oznacz jako przeczytane"
 
-#: ../../mod/settings.php:736
+#: ../../mod/settings.php:737
 msgid "Move to folder"
 msgstr "Przenieś do folderu"
 
-#: ../../mod/settings.php:737
+#: ../../mod/settings.php:738
 msgid "Move to folder:"
 msgstr "Przenieś do folderu:"
 
-#: ../../mod/settings.php:768 ../../mod/admin.php:404
+#: ../../mod/settings.php:769 ../../mod/admin.php:420
 msgid "No special theme for mobile devices"
 msgstr ""
 
-#: ../../mod/settings.php:808
+#: ../../mod/settings.php:809
 msgid "Display Settings"
 msgstr "Wyświetl ustawienia"
 
-#: ../../mod/settings.php:814 ../../mod/settings.php:825
+#: ../../mod/settings.php:815 ../../mod/settings.php:826
 msgid "Display Theme:"
 msgstr "Wyświetl motyw:"
 
-#: ../../mod/settings.php:815
+#: ../../mod/settings.php:816
 msgid "Mobile Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:816
+#: ../../mod/settings.php:817
 msgid "Update browser every xx seconds"
 msgstr "Odświeżaj stronę co xx sekund"
 
-#: ../../mod/settings.php:816
+#: ../../mod/settings.php:817
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Dolny limit 10 sekund, brak górnego limitu"
 
-#: ../../mod/settings.php:817
+#: ../../mod/settings.php:818
 msgid "Number of items to display per page:"
 msgstr ""
 
-#: ../../mod/settings.php:817
+#: ../../mod/settings.php:818
 msgid "Maximum of 100 items"
 msgstr "Maksymalnie 100 elementów"
 
-#: ../../mod/settings.php:818
+#: ../../mod/settings.php:819
 msgid "Don't show emoticons"
 msgstr "Nie pokazuj emotikonek"
 
-#: ../../mod/settings.php:894
+#: ../../mod/settings.php:895
 msgid "Normal Account Page"
 msgstr ""
 
-#: ../../mod/settings.php:895
+#: ../../mod/settings.php:896
 msgid "This account is a normal personal profile"
 msgstr "To konto jest normalnym osobistym profilem"
 
-#: ../../mod/settings.php:898
+#: ../../mod/settings.php:899
 msgid "Soapbox Page"
 msgstr ""
 
-#: ../../mod/settings.php:899
+#: ../../mod/settings.php:900
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr "Automatycznie zatwierdzaj wszystkie żądania połączenia/przyłączenia do znajomych jako fanów 'tylko do odczytu'"
 
-#: ../../mod/settings.php:902
+#: ../../mod/settings.php:903
 msgid "Community Forum/Celebrity Account"
 msgstr ""
 
-#: ../../mod/settings.php:903
+#: ../../mod/settings.php:904
 msgid ""
 "Automatically approve all connection/friend requests as read-write fans"
 msgstr "Automatycznie potwierdza wszystkie połączenia jako pełnoprawne z możliwością zapisu."
 
-#: ../../mod/settings.php:906
+#: ../../mod/settings.php:907
 msgid "Automatic Friend Page"
 msgstr ""
 
-#: ../../mod/settings.php:907
+#: ../../mod/settings.php:908
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr "Automatycznie traktuj wszystkie prośby o połączenia/zaproszenia do grona przyjaciół, jako przyjaciół"
 
-#: ../../mod/settings.php:910
+#: ../../mod/settings.php:911
 msgid "Private Forum [Experimental]"
 msgstr ""
 
-#: ../../mod/settings.php:911
+#: ../../mod/settings.php:912
 msgid "Private forum - approved members only"
 msgstr ""
 
-#: ../../mod/settings.php:923
+#: ../../mod/settings.php:924
 msgid "OpenID:"
 msgstr "OpenID:"
 
-#: ../../mod/settings.php:923
+#: ../../mod/settings.php:924
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr "Przeznacz to OpenID do logowania się na to konto."
 
-#: ../../mod/settings.php:933
+#: ../../mod/settings.php:934
 msgid "Publish your default profile in your local site directory?"
 msgstr "Czy publikować Twój profil w lokalnym katalogu tej instancji?"
 
-#: ../../mod/settings.php:939
+#: ../../mod/settings.php:940
 msgid "Publish your default profile in the global social directory?"
 msgstr "Opublikować twój niewypełniony profil w globalnym, społecznym katalogu?"
 
-#: ../../mod/settings.php:947
+#: ../../mod/settings.php:948
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr "Ukryć listę znajomych przed odwiedzającymi Twój profil?"
 
-#: ../../mod/settings.php:951
+#: ../../mod/settings.php:952
 msgid "Hide your profile details from unknown viewers?"
 msgstr "Ukryć szczegóły twojego profilu przed nieznajomymi ?"
 
-#: ../../mod/settings.php:956
+#: ../../mod/settings.php:957
 msgid "Allow friends to post to your profile page?"
 msgstr "Zezwól na dodawanie postów na twoim profilu przez znajomych"
 
-#: ../../mod/settings.php:962
+#: ../../mod/settings.php:963
 msgid "Allow friends to tag your posts?"
 msgstr "Zezwól na oznaczanie twoich postów przez znajomych"
 
-#: ../../mod/settings.php:968
+#: ../../mod/settings.php:969
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../mod/settings.php:974
+#: ../../mod/settings.php:975
 msgid "Permit unknown people to send you private mail?"
 msgstr ""
 
-#: ../../mod/settings.php:982
+#: ../../mod/settings.php:983
 msgid "Profile is <strong>not published</strong>."
 msgstr "Profil <strong>nie jest opublikowany</strong>"
 
-#: ../../mod/settings.php:985 ../../mod/profile_photo.php:248
+#: ../../mod/settings.php:986 ../../mod/profile_photo.php:248
 msgid "or"
 msgstr "lub"
 
-#: ../../mod/settings.php:990
+#: ../../mod/settings.php:991
 msgid "Your Identity Address is"
 msgstr "Twój adres identyfikacyjny to"
 
-#: ../../mod/settings.php:1001
+#: ../../mod/settings.php:1002
 msgid "Automatically expire posts after this many days:"
 msgstr ""
 
-#: ../../mod/settings.php:1001
+#: ../../mod/settings.php:1002
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr "Pole puste, wiadomość nie wygaśnie. Niezapisane wpisy zostaną usunięte."
 
-#: ../../mod/settings.php:1002
+#: ../../mod/settings.php:1003
 msgid "Advanced expiration settings"
 msgstr ""
 
-#: ../../mod/settings.php:1003
+#: ../../mod/settings.php:1004
 msgid "Advanced Expiration"
 msgstr ""
 
-#: ../../mod/settings.php:1004
+#: ../../mod/settings.php:1005
 msgid "Expire posts:"
 msgstr "Wygasające posty:"
 
-#: ../../mod/settings.php:1005
+#: ../../mod/settings.php:1006
 msgid "Expire personal notes:"
 msgstr "Wygasające notatki osobiste:"
 
-#: ../../mod/settings.php:1006
+#: ../../mod/settings.php:1007
 msgid "Expire starred posts:"
 msgstr ""
 
-#: ../../mod/settings.php:1007
+#: ../../mod/settings.php:1008
 msgid "Expire photos:"
 msgstr "Wygasające zdjęcia:"
 
-#: ../../mod/settings.php:1008
+#: ../../mod/settings.php:1009
 msgid "Only expire posts by others:"
 msgstr ""
 
-#: ../../mod/settings.php:1015
+#: ../../mod/settings.php:1016
 msgid "Account Settings"
 msgstr "Ustawienia konta"
 
-#: ../../mod/settings.php:1023
+#: ../../mod/settings.php:1024
 msgid "Password Settings"
 msgstr "Ustawienia hasła"
 
-#: ../../mod/settings.php:1024
+#: ../../mod/settings.php:1025
 msgid "New Password:"
 msgstr "Nowe hasło:"
 
-#: ../../mod/settings.php:1025
+#: ../../mod/settings.php:1026
 msgid "Confirm:"
 msgstr "Potwierdź:"
 
-#: ../../mod/settings.php:1025
+#: ../../mod/settings.php:1026
 msgid "Leave password fields blank unless changing"
 msgstr "Pozostaw pola hasła puste, chyba że chcesz je zmienić."
 
-#: ../../mod/settings.php:1029
+#: ../../mod/settings.php:1030
 msgid "Basic Settings"
 msgstr "Ustawienia podstawowe"
 
-#: ../../mod/settings.php:1030 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:1031 ../../include/profile_advanced.php:15
 msgid "Full Name:"
 msgstr "Imię i nazwisko:"
 
-#: ../../mod/settings.php:1031
+#: ../../mod/settings.php:1032
 msgid "Email Address:"
 msgstr "Adres email:"
 
-#: ../../mod/settings.php:1032
+#: ../../mod/settings.php:1033
 msgid "Your Timezone:"
 msgstr "Twoja strefa czasowa:"
 
-#: ../../mod/settings.php:1033
+#: ../../mod/settings.php:1034
 msgid "Default Post Location:"
 msgstr "Standardowa lokalizacja wiadomości:"
 
-#: ../../mod/settings.php:1034
+#: ../../mod/settings.php:1035
 msgid "Use Browser Location:"
 msgstr "Użyj położenia przeglądarki:"
 
-#: ../../mod/settings.php:1037
+#: ../../mod/settings.php:1038
 msgid "Security and Privacy Settings"
 msgstr "Ustawienia bezpieczeństwa i prywatności"
 
-#: ../../mod/settings.php:1039
+#: ../../mod/settings.php:1040
 msgid "Maximum Friend Requests/Day:"
 msgstr "Maksymalna liczba zaproszeń do grona przyjaciół na dzień:"
 
-#: ../../mod/settings.php:1039 ../../mod/settings.php:1058
+#: ../../mod/settings.php:1040 ../../mod/settings.php:1059
 msgid "(to prevent spam abuse)"
 msgstr "(aby zapobiec spamowaniu)"
 
-#: ../../mod/settings.php:1040
+#: ../../mod/settings.php:1041
 msgid "Default Post Permissions"
 msgstr "Domyślne prawa dostępu wiadomości"
 
-#: ../../mod/settings.php:1041
+#: ../../mod/settings.php:1042
 msgid "(click to open/close)"
 msgstr "(kliknij by otworzyć/zamknąć)"
 
-#: ../../mod/settings.php:1058
+#: ../../mod/settings.php:1059
 msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../mod/settings.php:1061
+#: ../../mod/settings.php:1062
 msgid "Notification Settings"
 msgstr "Ustawienia powiadomień"
 
-#: ../../mod/settings.php:1062
+#: ../../mod/settings.php:1063
 msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../mod/settings.php:1063
+#: ../../mod/settings.php:1064
 msgid "accepting a friend request"
 msgstr ""
 
-#: ../../mod/settings.php:1064
+#: ../../mod/settings.php:1065
 msgid "joining a forum/community"
 msgstr ""
 
-#: ../../mod/settings.php:1065
+#: ../../mod/settings.php:1066
 msgid "making an <em>interesting</em> profile change"
 msgstr ""
 
-#: ../../mod/settings.php:1066
+#: ../../mod/settings.php:1067
 msgid "Send a notification email when:"
 msgstr "Wyślij powiadmonienia na email, kiedy:"
 
-#: ../../mod/settings.php:1067
+#: ../../mod/settings.php:1068
 msgid "You receive an introduction"
 msgstr "Otrzymałeś zaproszenie"
 
-#: ../../mod/settings.php:1068
+#: ../../mod/settings.php:1069
 msgid "Your introductions are confirmed"
 msgstr "Dane zatwierdzone"
 
-#: ../../mod/settings.php:1069
+#: ../../mod/settings.php:1070
 msgid "Someone writes on your profile wall"
 msgstr "Ktoś pisze na twojej ścianie profilowej"
 
-#: ../../mod/settings.php:1070
+#: ../../mod/settings.php:1071
 msgid "Someone writes a followup comment"
 msgstr "Ktoś pisze komentarz nawiązujący."
 
-#: ../../mod/settings.php:1071
+#: ../../mod/settings.php:1072
 msgid "You receive a private message"
 msgstr "Otrzymałeś prywatną wiadomość"
 
-#: ../../mod/settings.php:1072
+#: ../../mod/settings.php:1073
 msgid "You receive a friend suggestion"
 msgstr "Otrzymane propozycje znajomych"
 
-#: ../../mod/settings.php:1073
+#: ../../mod/settings.php:1074
 msgid "You are tagged in a post"
 msgstr "Jesteś oznaczony w poście"
 
-#: ../../mod/settings.php:1074
+#: ../../mod/settings.php:1075
 msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: ../../mod/settings.php:1077
+#: ../../mod/settings.php:1078
 msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1078
+#: ../../mod/settings.php:1079
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
 #: ../../mod/manage.php:94
 msgid "Manage Identities and/or Pages"
-msgstr ""
+msgstr "Zarządzaj Tożsamościami i/lub Stronami."
 
 #: ../../mod/manage.php:97
 msgid ""
@@ -2788,16 +2818,16 @@ msgstr "Prywatne wiadomości do tej osoby mogą zostać publicznie ujawnione "
 msgid "Invalid contact."
 msgstr "Zły kontakt"
 
-#: ../../mod/notes.php:44 ../../boot.php:1755
+#: ../../mod/notes.php:44 ../../boot.php:1798
 msgid "Personal Notes"
 msgstr "Osobiste notatki"
 
-#: ../../mod/notes.php:63 ../../mod/filer.php:30
+#: ../../mod/notes.php:63 ../../mod/filer.php:31
 #: ../../addon/facebook/facebook.php:770
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:281
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:346
 #: ../../addon/fbpost/fbpost.php:314
 #: ../../addon/dav/friendica/layout.fnk.php:441
-#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:688
+#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:742
 #: ../../addon.old/facebook/facebook.php:770
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:263
 #: ../../addon.old/fbpost/fbpost.php:267
@@ -2821,10 +2851,20 @@ msgid "Move account"
 msgstr ""
 
 #: ../../mod/uimport.php:67
+msgid "You can import an account from another Friendica server."
+msgstr ""
+
+#: ../../mod/uimport.php:68
 msgid ""
-"You can import an account from another Friendica server. <br>\r\n"
-"                            You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here.<br>\r\n"
-"                            <b>This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from diaspora"
+"You need to export your account from the old server and upload it here. We "
+"will recreate your old account here with all your contacts. We will try also"
+" to inform your friends that you moved here."
+msgstr ""
+
+#: ../../mod/uimport.php:69
+msgid ""
+"This feature is experimental. We can't import contacts from the OStatus "
+"network (statusnet/identi.ca) or from Diaspora"
 msgstr ""
 
 #: ../../mod/uimport.php:70
@@ -2868,7 +2908,8 @@ msgstr ""
 
 #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
 #: ../../mod/message.php:249 ../../mod/message.php:257
-#: ../../include/conversation.php:905 ../../include/conversation.php:923
+#: ../../mod/message.php:429 ../../mod/message.php:437
+#: ../../include/conversation.php:941 ../../include/conversation.php:959
 msgid "Please enter a link URL:"
 msgstr "Proszę wpisać adres URL:"
 
@@ -2884,17 +2925,17 @@ msgid ""
 msgstr ""
 
 #: ../../mod/wallmessage.php:140 ../../mod/message.php:286
-#: ../../mod/message.php:476
+#: ../../mod/message.php:516
 msgid "To:"
 msgstr "Do:"
 
 #: ../../mod/wallmessage.php:141 ../../mod/message.php:291
-#: ../../mod/message.php:478
+#: ../../mod/message.php:518
 msgid "Subject:"
 msgstr "Temat:"
 
 #: ../../mod/wallmessage.php:147 ../../mod/message.php:295
-#: ../../mod/message.php:481 ../../mod/invite.php:113
+#: ../../mod/message.php:521 ../../mod/invite.php:113
 msgid "Your message:"
 msgstr "Twoja wiadomość:"
 
@@ -2949,9 +2990,9 @@ msgid ""
 msgstr ""
 
 #: ../../mod/newmember.php:32 ../../mod/profperm.php:103
-#: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7
+#: ../../view/theme/diabook/theme.php:89 ../../include/profile_advanced.php:7
 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50
-#: ../../boot.php:1731
+#: ../../boot.php:1774
 msgid "Profile"
 msgstr "Profil"
 
@@ -3114,7 +3155,7 @@ msgstr "Grupa utworzona."
 msgid "Could not create group."
 msgstr "Nie mogę stworzyć grupy"
 
-#: ../../mod/group.php:47 ../../mod/group.php:137
+#: ../../mod/group.php:47 ../../mod/group.php:140
 msgid "Group not found."
 msgstr "Nie znaleziono grupy"
 
@@ -3126,31 +3167,31 @@ msgstr "Nazwa grupy zmieniona"
 msgid "Permission denied"
 msgstr "Odmowa dostępu"
 
-#: ../../mod/group.php:90
+#: ../../mod/group.php:93
 msgid "Create a group of contacts/friends."
 msgstr "Stwórz grupę znajomych."
 
-#: ../../mod/group.php:91 ../../mod/group.php:177
+#: ../../mod/group.php:94 ../../mod/group.php:180
 msgid "Group Name: "
 msgstr "Nazwa grupy: "
 
-#: ../../mod/group.php:110
+#: ../../mod/group.php:113
 msgid "Group removed."
 msgstr "Grupa usunięta."
 
-#: ../../mod/group.php:112
+#: ../../mod/group.php:115
 msgid "Unable to remove group."
 msgstr "Nie można usunąć grupy."
 
-#: ../../mod/group.php:176
+#: ../../mod/group.php:179
 msgid "Group Editor"
 msgstr "Edytor grupy"
 
-#: ../../mod/group.php:189
+#: ../../mod/group.php:192
 msgid "Members"
 msgstr "Członkowie"
 
-#: ../../mod/group.php:221 ../../mod/profperm.php:105
+#: ../../mod/group.php:223 ../../mod/profperm.php:105
 msgid "Click on a contact to add or remove."
 msgstr "Kliknij na kontakt w celu dodania lub usunięcia."
 
@@ -3174,7 +3215,7 @@ msgstr "Wszystkie kontakty (z bezpiecznym dostępem do profilu)"
 msgid "No contacts."
 msgstr "brak kontaktów"
 
-#: ../../mod/viewcontacts.php:76 ../../include/text.php:625
+#: ../../mod/viewcontacts.php:76 ../../include/text.php:679
 msgid "View Contacts"
 msgstr "widok kontaktów"
 
@@ -3209,7 +3250,7 @@ msgstr "Twoja rejestracja oczekuje na zaakceptowanie przez właściciela witryny
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
-msgstr ""
+msgstr "Masz możliwość (opcjonalnie) wypełnić ten formularz przez OpenID poprzez załączenie Twojego OpenID i kliknięcie 'Zarejestruj'."
 
 #: ../../mod/register.php:219
 msgid ""
@@ -3233,7 +3274,7 @@ msgstr "Członkostwo na tej stronie możliwe tylko dzięki zaproszeniu."
 msgid "Your invitation ID: "
 msgstr "Twoje zaproszenia ID:"
 
-#: ../../mod/register.php:260 ../../mod/admin.php:446
+#: ../../mod/register.php:260 ../../mod/admin.php:462
 msgid "Registration"
 msgstr "Rejestracja"
 
@@ -3256,7 +3297,7 @@ msgstr "Wybierz login. Login musi zaczynać się literą. Adres twojego profilu
 msgid "Choose a nickname: "
 msgstr "Wybierz pseudonim:"
 
-#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:923
+#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:951
 msgid "Register"
 msgstr "Zarejestruj"
 
@@ -3265,9 +3306,9 @@ msgid "People Search"
 msgstr "Szukaj osób"
 
 #: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62
-#: ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1442
-#: ../../include/diaspora.php:1848 ../../include/conversation.php:125
+#: ../../addon/communityhome/communityhome.php:166
+#: ../../view/theme/diabook/theme.php:465 ../../include/text.php:1499
+#: ../../include/diaspora.php:1851 ../../include/conversation.php:125
 #: ../../include/conversation.php:253
 #: ../../addon.old/communityhome/communityhome.php:163
 msgid "photo"
@@ -3275,10 +3316,10 @@ msgstr "zdjęcie"
 
 #: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/subthread.php:87
 #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598
-#: ../../addon/communityhome/communityhome.php:158
-#: ../../addon/communityhome/communityhome.php:167
-#: ../../view/theme/diabook/theme.php:459
-#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1848
+#: ../../addon/communityhome/communityhome.php:161
+#: ../../addon/communityhome/communityhome.php:170
+#: ../../view/theme/diabook/theme.php:460
+#: ../../view/theme/diabook/theme.php:469 ../../include/diaspora.php:1851
 #: ../../include/conversation.php:120 ../../include/conversation.php:129
 #: ../../include/conversation.php:248 ../../include/conversation.php:257
 #: ../../addon.old/facebook/facebook.php:1598
@@ -3288,8 +3329,8 @@ msgid "status"
 msgstr "status"
 
 #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602
-#: ../../addon/communityhome/communityhome.php:172
-#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1864
+#: ../../addon/communityhome/communityhome.php:175
+#: ../../view/theme/diabook/theme.php:474 ../../include/diaspora.php:1867
 #: ../../include/conversation.php:136
 #: ../../addon.old/facebook/facebook.php:1602
 #: ../../addon.old/communityhome/communityhome.php:172
@@ -3303,8 +3344,8 @@ msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s nie lubi %2$s's %3$s"
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
-#: ../../mod/admin.php:737 ../../mod/admin.php:936 ../../mod/display.php:39
-#: ../../mod/display.php:169 ../../include/items.php:3843
+#: ../../mod/admin.php:773 ../../mod/admin.php:972 ../../mod/display.php:39
+#: ../../mod/display.php:169 ../../include/items.php:3853
 msgid "Item not found."
 msgstr "Element nie znaleziony."
 
@@ -3312,12 +3353,12 @@ msgstr "Element nie znaleziony."
 msgid "Access denied."
 msgstr "Brak dostępu"
 
-#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90
-#: ../../include/nav.php:51 ../../boot.php:1738
+#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:91
+#: ../../include/nav.php:51 ../../boot.php:1781
 msgid "Photos"
 msgstr "Zdjęcia"
 
-#: ../../mod/fbrowser.php:96
+#: ../../mod/fbrowser.php:113
 msgid "Files"
 msgstr "Pliki"
 
@@ -3504,15 +3545,15 @@ msgstr "Ty i %s"
 msgid "%s and You"
 msgstr "%s i ty"
 
-#: ../../mod/message.php:357 ../../mod/message.php:469
+#: ../../mod/message.php:368 ../../mod/message.php:509
 msgid "Delete conversation"
 msgstr "Usuń rozmowę"
 
-#: ../../mod/message.php:360
+#: ../../mod/message.php:371
 msgid "D, d M Y - g:i A"
 msgstr "D, d M R - g:m AM/PM"
 
-#: ../../mod/message.php:363
+#: ../../mod/message.php:374
 #, php-format
 msgid "%d message"
 msgid_plural "%d messages"
@@ -3520,21 +3561,21 @@ msgstr[0] " %d wiadomość"
 msgstr[1] " %d wiadomości"
 msgstr[2] " %d wiadomości"
 
-#: ../../mod/message.php:398
+#: ../../mod/message.php:413
 msgid "Message not available."
 msgstr "Wiadomość nie jest dostępna."
 
-#: ../../mod/message.php:451
+#: ../../mod/message.php:483
 msgid "Delete message"
 msgstr "Usuń wiadomość"
 
-#: ../../mod/message.php:471
+#: ../../mod/message.php:511
 msgid ""
 "No secure communications available. You <strong>may</strong> be able to "
 "respond from the sender's profile page."
 msgstr ""
 
-#: ../../mod/message.php:475
+#: ../../mod/message.php:515
 msgid "Send Reply"
 msgstr "Odpowiedz"
 
@@ -3551,19 +3592,19 @@ msgstr "Brak znajomych do wyświetlenia"
 msgid "Theme settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:96 ../../mod/admin.php:444
+#: ../../mod/admin.php:96 ../../mod/admin.php:460
 msgid "Site"
 msgstr "Strona"
 
-#: ../../mod/admin.php:97 ../../mod/admin.php:691 ../../mod/admin.php:704
+#: ../../mod/admin.php:97 ../../mod/admin.php:727 ../../mod/admin.php:740
 msgid "Users"
 msgstr "Użytkownicy"
 
-#: ../../mod/admin.php:98 ../../mod/admin.php:786 ../../mod/admin.php:828
+#: ../../mod/admin.php:98 ../../mod/admin.php:822 ../../mod/admin.php:864
 msgid "Plugins"
 msgstr "Wtyczki"
 
-#: ../../mod/admin.php:99 ../../mod/admin.php:991 ../../mod/admin.php:1027
+#: ../../mod/admin.php:99 ../../mod/admin.php:1027 ../../mod/admin.php:1063
 msgid "Themes"
 msgstr "Temat"
 
@@ -3571,11 +3612,11 @@ msgstr "Temat"
 msgid "DB updates"
 msgstr ""
 
-#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1114
+#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1150
 msgid "Logs"
 msgstr "Logi"
 
-#: ../../mod/admin.php:120 ../../include/nav.php:149
+#: ../../mod/admin.php:120 ../../include/nav.php:151
 msgid "Admin"
 msgstr "Administator"
 
@@ -3587,19 +3628,19 @@ msgstr "Polecane wtyczki"
 msgid "User registrations waiting for confirmation"
 msgstr "Rejestracje użytkownika czekają na potwierdzenie."
 
-#: ../../mod/admin.php:183 ../../mod/admin.php:672
+#: ../../mod/admin.php:183 ../../mod/admin.php:698
 msgid "Normal Account"
 msgstr "Konto normalne"
 
-#: ../../mod/admin.php:184 ../../mod/admin.php:673
+#: ../../mod/admin.php:184 ../../mod/admin.php:699
 msgid "Soapbox Account"
 msgstr ""
 
-#: ../../mod/admin.php:185 ../../mod/admin.php:674
+#: ../../mod/admin.php:185 ../../mod/admin.php:700
 msgid "Community/Celebrity Account"
 msgstr "Konto społeczności/gwiazdy"
 
-#: ../../mod/admin.php:186 ../../mod/admin.php:675
+#: ../../mod/admin.php:186 ../../mod/admin.php:701
 msgid "Automatic Friend Account"
 msgstr "Automatyczny przyjaciel konta"
 
@@ -3615,9 +3656,9 @@ msgstr ""
 msgid "Message queues"
 msgstr ""
 
-#: ../../mod/admin.php:212 ../../mod/admin.php:443 ../../mod/admin.php:690
-#: ../../mod/admin.php:785 ../../mod/admin.php:827 ../../mod/admin.php:990
-#: ../../mod/admin.php:1026 ../../mod/admin.php:1113
+#: ../../mod/admin.php:212 ../../mod/admin.php:459 ../../mod/admin.php:726
+#: ../../mod/admin.php:821 ../../mod/admin.php:863 ../../mod/admin.php:1026
+#: ../../mod/admin.php:1062 ../../mod/admin.php:1149
 msgid "Administration"
 msgstr "Administracja"
 
@@ -3641,391 +3682,439 @@ msgstr "Wersja"
 msgid "Active plugins"
 msgstr "Aktywne pluginy"
 
-#: ../../mod/admin.php:375
+#: ../../mod/admin.php:391
 msgid "Site settings updated."
 msgstr "Ustawienia strony zaktualizowane"
 
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:446
 msgid "Closed"
 msgstr "Zamknięty"
 
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:447
 msgid "Requires approval"
 msgstr "Wymagane zatwierdzenie."
 
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:448
 msgid "Open"
 msgstr "Otwórz"
 
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:452
 msgid "No SSL policy, links will track page SSL state"
 msgstr ""
 
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:453
 msgid "Force all links to use SSL"
 msgstr ""
 
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:454
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr ""
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:463
 msgid "File upload"
 msgstr "Plik załadowano"
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:464
 msgid "Policies"
 msgstr "zasady"
 
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:465
 msgid "Advanced"
 msgstr "Zaawansowany"
 
-#: ../../mod/admin.php:453 ../../addon/statusnet/statusnet.php:691
+#: ../../mod/admin.php:466
+msgid "Performance"
+msgstr ""
+
+#: ../../mod/admin.php:470 ../../addon/statusnet/statusnet.php:694
 #: ../../addon.old/statusnet/statusnet.php:567
 msgid "Site name"
 msgstr "Nazwa strony"
 
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:471
 msgid "Banner/Logo"
 msgstr "Logo"
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:472
 msgid "System language"
 msgstr "Język systemu"
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:473
 msgid "System theme"
 msgstr "Motyw systemowy"
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:473
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr ""
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:474
 msgid "Mobile system theme"
 msgstr ""
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:474
 msgid "Theme for mobile devices"
 msgstr ""
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:475
 msgid "SSL link policy"
 msgstr ""
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:475
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr ""
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:476
+msgid "'Share' element"
+msgstr ""
+
+#: ../../mod/admin.php:476
+msgid "Activates the bbcode element 'share' for repeating items."
+msgstr ""
+
+#: ../../mod/admin.php:477
 msgid "Maximum image size"
 msgstr "Maksymalny rozmiar zdjęcia"
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:477
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: ../../mod/admin.php:460
+#: ../../mod/admin.php:478
 msgid "Maximum image length"
 msgstr "Maksymalna długość obrazu"
 
-#: ../../mod/admin.php:460
+#: ../../mod/admin.php:478
 msgid ""
 "Maximum length in pixels of the longest side of uploaded images. Default is "
 "-1, which means no limits."
 msgstr "Maksymalna długość najdłuższej strony przesyłanego obrazu w pikselach.\nDomyślnie jest to -1, co oznacza brak limitu."
 
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:479
 msgid "JPEG image quality"
 msgstr "jakość obrazu JPEG"
 
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:479
 msgid ""
 "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
 "100, which is full quality."
 msgstr ""
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:481
 msgid "Register policy"
 msgstr "Zarejestruj polisę"
 
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:482
 msgid "Maximum Daily Registrations"
 msgstr ""
 
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:482
 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 ""
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:483
 msgid "Register text"
 msgstr "Zarejestruj tekst"
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:483
 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:484
 msgid "Accounts abandoned after x days"
 msgstr "Konto porzucone od x dni."
 
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:484
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:485
 msgid "Allowed friend domains"
 msgstr "Dozwolone domeny przyjaciół"
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:485
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr ""
 
-#: ../../mod/admin.php:468
+#: ../../mod/admin.php:486
 msgid "Allowed email domains"
 msgstr "Dozwolone domeny e-mailowe"
 
-#: ../../mod/admin.php:468
+#: ../../mod/admin.php:486
 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 ""
 
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:487
 msgid "Block public"
 msgstr "Blokuj publicznie"
 
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:487
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr ""
 
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:488
 msgid "Force publish"
 msgstr "Wymuś publikację"
 
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:488
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:489
 msgid "Global directory update URL"
 msgstr ""
 
-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:489
 msgid ""
 "URL to update the global directory. If this is not set, the global directory"
 " is completely unavailable to the application."
 msgstr ""
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:490
 msgid "Allow threaded items"
 msgstr ""
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:490
 msgid "Allow infinite level threading for items on this site."
 msgstr ""
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:491
 msgid "Private posts by default for new users"
 msgstr ""
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:491
 msgid ""
 "Set default post permissions for all new members to the default privacy "
 "group rather than public."
 msgstr ""
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:493
 msgid "Block multiple registrations"
 msgstr ""
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:493
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr ""
 
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:494
 msgid "OpenID support"
 msgstr "Wsparcie OpenID"
 
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:494
 msgid "OpenID support for registration and logins."
 msgstr ""
 
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:495
 msgid "Fullname check"
 msgstr ""
 
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:495
 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr ""
 
-#: ../../mod/admin.php:478
+#: ../../mod/admin.php:496
 msgid "UTF-8 Regular expressions"
 msgstr ""
 
-#: ../../mod/admin.php:478
+#: ../../mod/admin.php:496
 msgid "Use PHP UTF8 regular expressions"
 msgstr ""
 
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:497
 msgid "Show Community Page"
 msgstr "Pokaż stronę społeczności"
 
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:497
 msgid ""
 "Display a Community page showing all recent public postings on this site."
 msgstr ""
 
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:498
 msgid "Enable OStatus support"
 msgstr ""
 
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:498
 msgid ""
 "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All "
 "communications in OStatus are public, so privacy warnings will be "
 "occasionally displayed."
 msgstr ""
 
-#: ../../mod/admin.php:481
+#: ../../mod/admin.php:499
 msgid "Enable Diaspora support"
 msgstr ""
 
-#: ../../mod/admin.php:481
+#: ../../mod/admin.php:499
 msgid "Provide built-in Diaspora network compatibility."
 msgstr ""
 
-#: ../../mod/admin.php:482
+#: ../../mod/admin.php:500
 msgid "Only allow Friendica contacts"
 msgstr ""
 
-#: ../../mod/admin.php:482
+#: ../../mod/admin.php:500
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr ""
 
-#: ../../mod/admin.php:483
+#: ../../mod/admin.php:501
 msgid "Verify SSL"
 msgstr "Weryfikacja SSL"
 
-#: ../../mod/admin.php:483
+#: ../../mod/admin.php:501
 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 ""
 
-#: ../../mod/admin.php:484
+#: ../../mod/admin.php:502
 msgid "Proxy user"
 msgstr "Użytkownik proxy"
 
-#: ../../mod/admin.php:485
+#: ../../mod/admin.php:503
 msgid "Proxy URL"
 msgstr ""
 
-#: ../../mod/admin.php:486
+#: ../../mod/admin.php:504
 msgid "Network timeout"
 msgstr ""
 
-#: ../../mod/admin.php:486
+#: ../../mod/admin.php:504
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../mod/admin.php:487
+#: ../../mod/admin.php:505
 msgid "Delivery interval"
 msgstr ""
 
-#: ../../mod/admin.php:487
+#: ../../mod/admin.php:505
 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 ""
 
-#: ../../mod/admin.php:488
+#: ../../mod/admin.php:506
 msgid "Poll interval"
 msgstr ""
 
-#: ../../mod/admin.php:488
+#: ../../mod/admin.php:506
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr ""
 
-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:507
 msgid "Maximum Load Average"
 msgstr ""
 
-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:507
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr ""
 
-#: ../../mod/admin.php:506
+#: ../../mod/admin.php:509
+msgid "Use MySQL full text engine"
+msgstr ""
+
+#: ../../mod/admin.php:509
+msgid ""
+"Activates the full text engine. Speeds up search - but can only search for "
+"four and more characters."
+msgstr ""
+
+#: ../../mod/admin.php:510
+msgid "Path to item cache"
+msgstr ""
+
+#: ../../mod/admin.php:511
+msgid "Cache duration in seconds"
+msgstr ""
+
+#: ../../mod/admin.php:511
+msgid ""
+"How long should the cache files be hold? Default value is 86400 seconds (One"
+" day)."
+msgstr ""
+
+#: ../../mod/admin.php:512
+msgid "Path for lock file"
+msgstr ""
+
+#: ../../mod/admin.php:513
+msgid "Temp path"
+msgstr ""
+
+#: ../../mod/admin.php:514
+msgid "Base path to installation"
+msgstr ""
+
+#: ../../mod/admin.php:532
 msgid "Update has been marked successful"
 msgstr ""
 
-#: ../../mod/admin.php:516
+#: ../../mod/admin.php:542
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr ""
 
-#: ../../mod/admin.php:519
+#: ../../mod/admin.php:545
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr ""
 
-#: ../../mod/admin.php:523
+#: ../../mod/admin.php:549
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: ../../mod/admin.php:526
+#: ../../mod/admin.php:552
 #, php-format
 msgid "Update function %s could not be found."
 msgstr ""
 
-#: ../../mod/admin.php:541
+#: ../../mod/admin.php:567
 msgid "No failed updates."
 msgstr "Brak błędów aktualizacji."
 
-#: ../../mod/admin.php:545
+#: ../../mod/admin.php:571
 msgid "Failed Updates"
 msgstr "Błąd aktualizacji"
 
-#: ../../mod/admin.php:546
+#: ../../mod/admin.php:572
 msgid ""
 "This does not include updates prior to 1139, which did not return a status."
 msgstr ""
 
-#: ../../mod/admin.php:547
+#: ../../mod/admin.php:573
 msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: ../../mod/admin.php:548
+#: ../../mod/admin.php:574
 msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: ../../mod/admin.php:573
+#: ../../mod/admin.php:599
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
@@ -4033,7 +4122,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../../mod/admin.php:580
+#: ../../mod/admin.php:606
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
@@ -4041,180 +4130,180 @@ msgstr[0] " %s użytkownik usunięty"
 msgstr[1] " %s użytkownicy usunięci"
 msgstr[2] " %s usuniętych użytkowników "
 
-#: ../../mod/admin.php:619
+#: ../../mod/admin.php:645
 #, php-format
 msgid "User '%s' deleted"
 msgstr "Użytkownik '%s' usunięty"
 
-#: ../../mod/admin.php:627
+#: ../../mod/admin.php:653
 #, php-format
 msgid "User '%s' unblocked"
 msgstr "Użytkownik '%s' odblokowany"
 
-#: ../../mod/admin.php:627
+#: ../../mod/admin.php:653
 #, php-format
 msgid "User '%s' blocked"
 msgstr "Użytkownik '%s' zablokowany"
 
-#: ../../mod/admin.php:693
+#: ../../mod/admin.php:729
 msgid "select all"
 msgstr "Zaznacz wszystko"
 
-#: ../../mod/admin.php:694
+#: ../../mod/admin.php:730
 msgid "User registrations waiting for confirm"
 msgstr "zarejestrowany użytkownik czeka na potwierdzenie"
 
-#: ../../mod/admin.php:695
+#: ../../mod/admin.php:731
 msgid "Request date"
 msgstr "Data prośby"
 
-#: ../../mod/admin.php:695 ../../mod/admin.php:705
+#: ../../mod/admin.php:731 ../../mod/admin.php:741
 #: ../../include/contact_selectors.php:79
 #: ../../include/contact_selectors.php:86
 msgid "Email"
 msgstr "E-mail"
 
-#: ../../mod/admin.php:696
+#: ../../mod/admin.php:732
 msgid "No registrations."
 msgstr "brak rejestracji"
 
-#: ../../mod/admin.php:698
+#: ../../mod/admin.php:734
 msgid "Deny"
 msgstr "Odmów"
 
-#: ../../mod/admin.php:702
+#: ../../mod/admin.php:738
 msgid "Site admin"
 msgstr "Administracja stroną"
 
-#: ../../mod/admin.php:705
+#: ../../mod/admin.php:741
 msgid "Register date"
 msgstr "Data rejestracji"
 
-#: ../../mod/admin.php:705
+#: ../../mod/admin.php:741
 msgid "Last login"
 msgstr "Ostatnie logowanie"
 
-#: ../../mod/admin.php:705
+#: ../../mod/admin.php:741
 msgid "Last item"
 msgstr "Ostatni element"
 
-#: ../../mod/admin.php:705
+#: ../../mod/admin.php:741
 msgid "Account"
 msgstr "Konto"
 
-#: ../../mod/admin.php:707
+#: ../../mod/admin.php:743
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Zaznaczeni użytkownicy zostaną usunięci!\\n\\nWszystko co zamieścili na tej stronie będzie trwale skasowane!\\n\\nJesteś pewien?"
 
-#: ../../mod/admin.php:708
+#: ../../mod/admin.php:744
 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żytkownik {0} zostanie usunięty!\\n\\nWszystko co zamieścił na tej stronie będzie trwale skasowane!\\n\\nJesteś pewien?"
 
-#: ../../mod/admin.php:749
+#: ../../mod/admin.php:785
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Wtyczka %s wyłączona."
 
-#: ../../mod/admin.php:753
+#: ../../mod/admin.php:789
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Wtyczka %s właczona."
 
-#: ../../mod/admin.php:763 ../../mod/admin.php:961
+#: ../../mod/admin.php:799 ../../mod/admin.php:997
 msgid "Disable"
 msgstr "Wyłącz"
 
-#: ../../mod/admin.php:765 ../../mod/admin.php:963
+#: ../../mod/admin.php:801 ../../mod/admin.php:999
 msgid "Enable"
 msgstr "Zezwól"
 
-#: ../../mod/admin.php:787 ../../mod/admin.php:992
+#: ../../mod/admin.php:823 ../../mod/admin.php:1028
 msgid "Toggle"
 msgstr "Włącz"
 
-#: ../../mod/admin.php:795 ../../mod/admin.php:1002
+#: ../../mod/admin.php:831 ../../mod/admin.php:1038
 msgid "Author: "
 msgstr "Autor: "
 
-#: ../../mod/admin.php:796 ../../mod/admin.php:1003
+#: ../../mod/admin.php:832 ../../mod/admin.php:1039
 msgid "Maintainer: "
 msgstr ""
 
-#: ../../mod/admin.php:925
+#: ../../mod/admin.php:961
 msgid "No themes found."
 msgstr "Nie znaleziono tematu."
 
-#: ../../mod/admin.php:984
+#: ../../mod/admin.php:1020
 msgid "Screenshot"
 msgstr "Zrzut ekranu"
 
-#: ../../mod/admin.php:1032
+#: ../../mod/admin.php:1068
 msgid "[Experimental]"
 msgstr "[Eksperymentalne]"
 
-#: ../../mod/admin.php:1033
+#: ../../mod/admin.php:1069
 msgid "[Unsupported]"
 msgstr "[Niewspieralne]"
 
-#: ../../mod/admin.php:1060
+#: ../../mod/admin.php:1096
 msgid "Log settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:1116
+#: ../../mod/admin.php:1152
 msgid "Clear"
 msgstr "Wyczyść"
 
-#: ../../mod/admin.php:1122
+#: ../../mod/admin.php:1158
 msgid "Debugging"
 msgstr ""
 
-#: ../../mod/admin.php:1123
+#: ../../mod/admin.php:1159
 msgid "Log file"
 msgstr ""
 
-#: ../../mod/admin.php:1123
+#: ../../mod/admin.php:1159
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr ""
 
-#: ../../mod/admin.php:1124
+#: ../../mod/admin.php:1160
 msgid "Log level"
 msgstr ""
 
-#: ../../mod/admin.php:1174
+#: ../../mod/admin.php:1210
 msgid "Close"
 msgstr "Zamknij"
 
-#: ../../mod/admin.php:1180
+#: ../../mod/admin.php:1216
 msgid "FTP Host"
 msgstr "Założyciel FTP"
 
-#: ../../mod/admin.php:1181
+#: ../../mod/admin.php:1217
 msgid "FTP Path"
 msgstr "Ścieżka FTP"
 
-#: ../../mod/admin.php:1182
+#: ../../mod/admin.php:1218
 msgid "FTP User"
 msgstr "Użytkownik FTP"
 
-#: ../../mod/admin.php:1183
+#: ../../mod/admin.php:1219
 msgid "FTP Password"
 msgstr "FTP Hasło"
 
-#: ../../mod/profile.php:21 ../../boot.php:1126
+#: ../../mod/profile.php:21 ../../boot.php:1160
 msgid "Requested profile is not available."
 msgstr "Żądany profil jest niedostępny"
 
-#: ../../mod/profile.php:155 ../../mod/display.php:87
+#: ../../mod/profile.php:156 ../../mod/display.php:87
 msgid "Access to this profile has been restricted."
 msgstr "Ograniczony dostęp do tego konta"
 
-#: ../../mod/profile.php:180
+#: ../../mod/profile.php:181
 msgid "Tips for New Members"
 msgstr "Wskazówki dla nowych użytkowników"
 
@@ -4263,7 +4352,7 @@ msgstr ""
 msgid "{0} mentioned you in a post"
 msgstr "{0} wspomniał Cię w swoim wpisie"
 
-#: ../../mod/nogroup.php:58
+#: ../../mod/nogroup.php:59
 msgid "Contacts who are not members of a group"
 msgstr ""
 
@@ -4276,8 +4365,8 @@ msgid ""
 "Account not found and OpenID registration is not permitted on this site."
 msgstr ""
 
-#: ../../mod/openid.php:93 ../../include/auth.php:110
-#: ../../include/auth.php:173
+#: ../../mod/openid.php:93 ../../include/auth.php:112
+#: ../../include/auth.php:175
 msgid "Login failed."
 msgstr "Niepowodzenie logowania"
 
@@ -4298,7 +4387,7 @@ msgstr ""
 msgid "%1$s is following %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/share.php:28
+#: ../../mod/share.php:43
 msgid "link"
 msgstr ""
 
@@ -4314,8 +4403,8 @@ msgstr "Aplikacje"
 msgid "No installed applications."
 msgstr "Brak zainstalowanych aplikacji."
 
-#: ../../mod/search.php:99 ../../include/text.php:685
-#: ../../include/text.php:686 ../../include/nav.php:91
+#: ../../mod/search.php:99 ../../include/text.php:739
+#: ../../include/text.php:740 ../../include/nav.php:91
 msgid "Search"
 msgstr "Szukaj"
 
@@ -4612,32 +4701,32 @@ msgstr "Wiek: "
 msgid "Edit/Manage Profiles"
 msgstr "Edytuj/Zarządzaj Profilami"
 
-#: ../../mod/profiles.php:700 ../../boot.php:1244
+#: ../../mod/profiles.php:700 ../../boot.php:1278
 msgid "Change profile photo"
 msgstr "Zmień zdjęcie profilowe"
 
-#: ../../mod/profiles.php:701 ../../boot.php:1245
+#: ../../mod/profiles.php:701 ../../boot.php:1279
 msgid "Create New Profile"
 msgstr "Stwórz nowy profil"
 
-#: ../../mod/profiles.php:712 ../../boot.php:1255
+#: ../../mod/profiles.php:712 ../../boot.php:1289
 msgid "Profile Image"
 msgstr "Obraz profilowy"
 
-#: ../../mod/profiles.php:714 ../../boot.php:1258
+#: ../../mod/profiles.php:714 ../../boot.php:1292
 msgid "visible to everybody"
 msgstr "widoczne dla wszystkich"
 
-#: ../../mod/profiles.php:715 ../../boot.php:1259
+#: ../../mod/profiles.php:715 ../../boot.php:1293
 msgid "Edit visibility"
 msgstr "Edytuj widoczność"
 
-#: ../../mod/filer.php:29 ../../include/conversation.php:909
-#: ../../include/conversation.php:927
+#: ../../mod/filer.php:30 ../../include/conversation.php:945
+#: ../../include/conversation.php:963
 msgid "Save to Folder:"
 msgstr "Zapisz w folderze:"
 
-#: ../../mod/filer.php:29
+#: ../../mod/filer.php:30
 msgid "- select -"
 msgstr "- wybierz -"
 
@@ -4650,7 +4739,7 @@ msgstr ""
 msgid "No potential page delegates located."
 msgstr ""
 
-#: ../../mod/delegate.php:121
+#: ../../mod/delegate.php:121 ../../include/nav.php:138
 msgid "Delegate Page Management"
 msgstr ""
 
@@ -4725,7 +4814,7 @@ msgstr ""
 msgid "diaspora2bb: "
 msgstr ""
 
-#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:520
+#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:521
 #: ../../include/contact_widgets.php:34
 msgid "Friend Suggestions"
 msgstr "Osoby, które możesz znać"
@@ -4741,7 +4830,7 @@ msgid "Ignore/Hide"
 msgstr "Ignoruj/Ukryj"
 
 #: ../../mod/directory.php:49 ../../addon/forumdirectory/forumdirectory.php:71
-#: ../../view/theme/diabook/theme.php:518
+#: ../../view/theme/diabook/theme.php:519
 msgid "Global Directory"
 msgstr "Globalne Położenie"
 
@@ -4760,19 +4849,19 @@ msgstr "Płeć: "
 
 #: ../../mod/directory.php:136
 #: ../../addon/forumdirectory/forumdirectory.php:158
-#: ../../include/profile_advanced.php:17 ../../boot.php:1280
+#: ../../include/profile_advanced.php:17 ../../boot.php:1314
 msgid "Gender:"
 msgstr "Płeć:"
 
 #: ../../mod/directory.php:138
 #: ../../addon/forumdirectory/forumdirectory.php:160
-#: ../../include/profile_advanced.php:37 ../../boot.php:1283
+#: ../../include/profile_advanced.php:37 ../../boot.php:1317
 msgid "Status:"
 msgstr "Status"
 
 #: ../../mod/directory.php:140
 #: ../../addon/forumdirectory/forumdirectory.php:162
-#: ../../include/profile_advanced.php:48 ../../boot.php:1285
+#: ../../include/profile_advanced.php:48 ../../boot.php:1319
 msgid "Homepage:"
 msgstr "Strona główna:"
 
@@ -4782,8 +4871,8 @@ msgstr "Strona główna:"
 msgid "About:"
 msgstr "O:"
 
-#: ../../mod/directory.php:180
-#: ../../addon/forumdirectory/forumdirectory.php:202
+#: ../../mod/directory.php:187
+#: ../../addon/forumdirectory/forumdirectory.php:203
 msgid "No entries (some entries may be hidden)."
 msgstr "Brak odwiedzin (niektóre odwiedziny mogą być ukryte)."
 
@@ -4939,7 +5028,7 @@ msgstr ""
 msgid ""
 "The ID provided by your system is a duplicate on our system. It should work "
 "if you try again."
-msgstr ""
+msgstr "ID dostarczone przez Twój system jest już w naszeym systemie. Powinno zadziałać jeżeli spróbujesz ponownie."
 
 #: ../../mod/dfrn_confirm.php:649
 msgid "Unable to set your contact credentials on our system."
@@ -5196,7 +5285,7 @@ msgstr ""
 msgid "Post to Facebook"
 msgstr "Post na Facebook"
 
-#: ../../addon/facebook/facebook.php:921 ../../addon/fbpost/fbpost.php:446
+#: ../../addon/facebook/facebook.php:921 ../../addon/fbpost/fbpost.php:471
 #: ../../addon.old/facebook/facebook.php:921
 #: ../../addon.old/fbpost/fbpost.php:399
 msgid ""
@@ -5204,31 +5293,31 @@ msgid ""
 "conflict."
 msgstr "Publikacja na stronie Facebook nie powiodła się z powodu braku dostępu do sieci"
 
-#: ../../addon/facebook/facebook.php:1149 ../../addon/fbpost/fbpost.php:722
+#: ../../addon/facebook/facebook.php:1149 ../../addon/fbpost/fbpost.php:750
 #: ../../addon.old/facebook/facebook.php:1149
 #: ../../addon.old/fbpost/fbpost.php:610
 msgid "View on Friendica"
 msgstr "Zobacz na Friendice"
 
-#: ../../addon/facebook/facebook.php:1182 ../../addon/fbpost/fbpost.php:759
+#: ../../addon/facebook/facebook.php:1182 ../../addon/fbpost/fbpost.php:787
 #: ../../addon.old/facebook/facebook.php:1182
 #: ../../addon.old/fbpost/fbpost.php:643
 msgid "Facebook post failed. Queued for retry."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1222 ../../addon/fbpost/fbpost.php:799
+#: ../../addon/facebook/facebook.php:1222 ../../addon/fbpost/fbpost.php:827
 #: ../../addon.old/facebook/facebook.php:1222
 #: ../../addon.old/fbpost/fbpost.php:683
 msgid "Your Facebook connection became invalid. Please Re-authenticate."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1223 ../../addon/fbpost/fbpost.php:800
+#: ../../addon/facebook/facebook.php:1223 ../../addon/fbpost/fbpost.php:828
 #: ../../addon.old/facebook/facebook.php:1223
 #: ../../addon.old/fbpost/fbpost.php:684
 msgid "Facebook connection became invalid"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1224 ../../addon/fbpost/fbpost.php:801
+#: ../../addon/facebook/facebook.php:1224 ../../addon/fbpost/fbpost.php:829
 #: ../../addon.old/facebook/facebook.php:1224
 #: ../../addon.old/fbpost/fbpost.php:685
 #, php-format
@@ -5253,27 +5342,27 @@ msgstr ""
 msgid "Automatically follow any StatusNet followers/mentioners"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:278
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:343
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:260
 msgid "Lifetime of the cache (in hours)"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:283
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:348
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:265
 msgid "Cache Statistics"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:286
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:351
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:268
 msgid "Number of items"
 msgstr "Numery elementów"
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:288
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:353
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:270
 msgid "Size of the cache"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:290
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:355
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:272
 msgid "Delete the whole cache"
 msgstr ""
@@ -5306,7 +5395,12 @@ msgstr "Napisz na stronę/grupę:"
 msgid "Facebook Post Settings"
 msgstr "Ustawienia wpisu z Facebooka"
 
-#: ../../addon/widgets/widget_like.php:58
+#: ../../addon/fbpost/fbpost.php:367
+#, php-format
+msgid "%s:"
+msgstr ""
+
+#: ../../addon/widgets/widget_like.php:59
 #: ../../addon.old/widgets/widget_like.php:58
 #, php-format
 msgid "%d person likes this"
@@ -5315,7 +5409,7 @@ msgstr[0] " %d osoba lubi to"
 msgstr[1] " %d osób lubi to"
 msgstr[2] " %d osób lubi to"
 
-#: ../../addon/widgets/widget_like.php:61
+#: ../../addon/widgets/widget_like.php:62
 #: ../../addon.old/widgets/widget_like.php:61
 #, php-format
 msgid "%d person doesn't like this"
@@ -5329,15 +5423,15 @@ msgstr[2] " %d osób tego nie lubi"
 msgid "Get added to this list!"
 msgstr "Zostań dodany do listy!"
 
-#: ../../addon/widgets/widgets.php:56 ../../addon.old/widgets/widgets.php:56
+#: ../../addon/widgets/widgets.php:57 ../../addon.old/widgets/widgets.php:56
 msgid "Generate new key"
 msgstr "Stwórz nowy klucz"
 
-#: ../../addon/widgets/widgets.php:59 ../../addon.old/widgets/widgets.php:59
+#: ../../addon/widgets/widgets.php:60 ../../addon.old/widgets/widgets.php:59
 msgid "Widgets key"
 msgstr ""
 
-#: ../../addon/widgets/widgets.php:61 ../../addon.old/widgets/widgets.php:61
+#: ../../addon/widgets/widgets.php:62 ../../addon.old/widgets/widgets.php:61
 msgid "Widgets available"
 msgstr ""
 
@@ -5660,7 +5754,7 @@ msgstr "Katalog Forum"
 #: ../../addon/communityhome/communityhome.php:34
 #: ../../addon/communityhome/twillingham/communityhome.php:28
 #: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:949
+#: ../../include/nav.php:64 ../../boot.php:976
 #: ../../addon.old/communityhome/communityhome.php:28
 #: ../../addon.old/communityhome/communityhome.php:34
 #: ../../addon.old/communityhome/twillingham/communityhome.php:28
@@ -5682,25 +5776,25 @@ msgstr "OpenID"
 msgid "Latest users"
 msgstr "Ostatni użytkownicy"
 
-#: ../../addon/communityhome/communityhome.php:81
+#: ../../addon/communityhome/communityhome.php:82
 #: ../../addon/communityhome/twillingham/communityhome.php:81
 #: ../../addon.old/communityhome/communityhome.php:81
 #: ../../addon.old/communityhome/twillingham/communityhome.php:81
 msgid "Most active users"
 msgstr "najaktywniejsi użytkownicy"
 
-#: ../../addon/communityhome/communityhome.php:98
+#: ../../addon/communityhome/communityhome.php:99
 #: ../../addon.old/communityhome/communityhome.php:98
 msgid "Latest photos"
 msgstr "Ostatnie zdjęcia"
 
-#: ../../addon/communityhome/communityhome.php:133
+#: ../../addon/communityhome/communityhome.php:136
 #: ../../addon.old/communityhome/communityhome.php:133
 msgid "Latest likes"
 msgstr "Ostatnie polubienia"
 
-#: ../../addon/communityhome/communityhome.php:155
-#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1440
+#: ../../addon/communityhome/communityhome.php:158
+#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1497
 #: ../../include/conversation.php:117 ../../include/conversation.php:245
 #: ../../addon.old/communityhome/communityhome.php:155
 msgid "event"
@@ -5854,7 +5948,7 @@ msgstr "Dni"
 #: ../../addon/dav/common/wdcal_edit.inc.php:254
 #: ../../addon/dav/common/wdcal_edit.inc.php:270
 #: ../../addon/dav/common/wdcal_edit.inc.php:293
-#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:976
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:231
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:254
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:270
@@ -5865,7 +5959,7 @@ msgstr "Niedziela"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:235
 #: ../../addon/dav/common/wdcal_edit.inc.php:274
-#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:976
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:235
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:274
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:308
@@ -5873,35 +5967,35 @@ msgid "Monday"
 msgstr "Poniedziałek"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:238
-#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:976
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:238
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:277
 msgid "Tuesday"
 msgstr "Wtorek"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:241
-#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:976
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:241
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:280
 msgid "Wednesday"
 msgstr "Środa"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:244
-#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:976
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:244
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:283
 msgid "Thursday"
 msgstr "Czwartek"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:247
-#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:976
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:247
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:286
 msgid "Friday"
 msgstr "Piątek"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:250
-#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:976
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:250
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:289
 msgid "Saturday"
@@ -6268,8 +6362,8 @@ msgid "Extended calendar with CalDAV-support"
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:279
-#: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:464
-#: ../../include/enotify.php:28 ../../include/notifier.php:778
+#: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:468
+#: ../../include/enotify.php:28 ../../include/notifier.php:781
 #: ../../addon.old/dav/friendica/main.php:279
 #: ../../addon.old/dav/friendica/main.php:280
 msgid "noreply"
@@ -6518,43 +6612,43 @@ msgstr ""
 msgid "Post to dreamwidth by default"
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:44
+#: ../../addon/remote_permissions/remote_permissions.php:45
 msgid "Remote Permissions Settings"
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:45
+#: ../../addon/remote_permissions/remote_permissions.php:46
 msgid ""
 "Allow recipients of your private posts to see the other recipients of the "
 "posts"
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:57
+#: ../../addon/remote_permissions/remote_permissions.php:58
 msgid "Remote Permissions settings updated."
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:177
+#: ../../addon/remote_permissions/remote_permissions.php:178
 msgid "Visible to"
 msgstr "Widoczne dla"
 
-#: ../../addon/remote_permissions/remote_permissions.php:177
+#: ../../addon/remote_permissions/remote_permissions.php:178
 msgid "may only be a partial list"
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:196
+#: ../../addon/remote_permissions/remote_permissions.php:197
 #: ../../addon/altpager/altpager.php:99
 msgid "Global"
 msgstr "Ogólne"
 
-#: ../../addon/remote_permissions/remote_permissions.php:196
+#: ../../addon/remote_permissions/remote_permissions.php:197
 msgid "The posts of every user on this server show the post recipients"
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:197
+#: ../../addon/remote_permissions/remote_permissions.php:198
 #: ../../addon/altpager/altpager.php:100
 msgid "Individual"
 msgstr "Indywidualne"
 
-#: ../../addon/remote_permissions/remote_permissions.php:197
+#: ../../addon/remote_permissions/remote_permissions.php:198
 msgid "Each user chooses whether his/her posts show the post recipients"
 msgstr ""
 
@@ -7031,11 +7125,11 @@ msgstr ""
 msgid "Use the MathJax renderer"
 msgstr ""
 
-#: ../../addon/mathjax/mathjax.php:74 ../../addon.old/mathjax/mathjax.php:74
+#: ../../addon/mathjax/mathjax.php:75 ../../addon.old/mathjax/mathjax.php:74
 msgid "MathJax Base URL"
 msgstr ""
 
-#: ../../addon/mathjax/mathjax.php:74 ../../addon.old/mathjax/mathjax.php:74
+#: ../../addon/mathjax/mathjax.php:75 ../../addon.old/mathjax/mathjax.php:74
 msgid ""
 "The URL for the javascript file that should be included to use MathJax. Can "
 "be either the MathJax CDN or another installation of MathJax."
@@ -7351,7 +7445,7 @@ msgstr ""
 msgid "Clear OAuth configuration"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:692
+#: ../../addon/statusnet/statusnet.php:695
 #: ../../addon.old/statusnet/statusnet.php:568
 msgid "API URL"
 msgstr ""
@@ -7597,11 +7691,11 @@ msgstr ""
 msgid "Send linked #-tags and @-names to Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:508 ../../addon.old/twitter/twitter.php:396
+#: ../../addon/twitter/twitter.php:517 ../../addon.old/twitter/twitter.php:396
 msgid "Consumer key"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:509 ../../addon.old/twitter/twitter.php:397
+#: ../../addon/twitter/twitter.php:518 ../../addon.old/twitter/twitter.php:397
 msgid "Consumer secret"
 msgstr ""
 
@@ -7739,137 +7833,137 @@ msgstr ""
 msgid "Color scheme"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49
+#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:49
 #: ../../include/nav.php:116
 msgid "Your posts and conversations"
 msgstr "Twoje posty i rozmowy"
 
-#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:50
+#: ../../view/theme/diabook/theme.php:89 ../../include/nav.php:50
 msgid "Your profile page"
 msgstr "Twoja strona profilowa"
 
-#: ../../view/theme/diabook/theme.php:89
+#: ../../view/theme/diabook/theme.php:90
 msgid "Your contacts"
 msgstr "Twoje kontakty"
 
-#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51
+#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:51
 msgid "Your photos"
 msgstr "Twoje zdjęcia"
 
-#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52
+#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:52
 msgid "Your events"
 msgstr "Twoje wydarzenia"
 
-#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:93 ../../include/nav.php:53
 msgid "Personal notes"
 msgstr "Osobiste notatki"
 
-#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:93 ../../include/nav.php:53
 msgid "Your personal photos"
 msgstr "Twoje osobiste zdjęcia"
 
-#: ../../view/theme/diabook/theme.php:94
-#: ../../view/theme/diabook/theme.php:537
-#: ../../view/theme/diabook/theme.php:632
+#: ../../view/theme/diabook/theme.php:95
+#: ../../view/theme/diabook/theme.php:538
+#: ../../view/theme/diabook/theme.php:633
 #: ../../view/theme/diabook/config.php:163
 msgid "Community Pages"
 msgstr "Strony społecznościowe"
 
-#: ../../view/theme/diabook/theme.php:384
-#: ../../view/theme/diabook/theme.php:634
+#: ../../view/theme/diabook/theme.php:385
+#: ../../view/theme/diabook/theme.php:635
 #: ../../view/theme/diabook/config.php:165
 msgid "Community Profiles"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:405
-#: ../../view/theme/diabook/theme.php:639
+#: ../../view/theme/diabook/theme.php:406
+#: ../../view/theme/diabook/theme.php:640
 #: ../../view/theme/diabook/config.php:170
 msgid "Last users"
 msgstr "Ostatni użytkownicy"
 
-#: ../../view/theme/diabook/theme.php:434
-#: ../../view/theme/diabook/theme.php:641
+#: ../../view/theme/diabook/theme.php:435
+#: ../../view/theme/diabook/theme.php:642
 #: ../../view/theme/diabook/config.php:172
 msgid "Last likes"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:479
-#: ../../view/theme/diabook/theme.php:640
+#: ../../view/theme/diabook/theme.php:480
+#: ../../view/theme/diabook/theme.php:641
 #: ../../view/theme/diabook/config.php:171
 msgid "Last photos"
 msgstr "Ostatnie zdjęcia"
 
-#: ../../view/theme/diabook/theme.php:516
-#: ../../view/theme/diabook/theme.php:637
+#: ../../view/theme/diabook/theme.php:517
+#: ../../view/theme/diabook/theme.php:638
 #: ../../view/theme/diabook/config.php:168
 msgid "Find Friends"
 msgstr "Znajdź znajomych"
 
-#: ../../view/theme/diabook/theme.php:517
+#: ../../view/theme/diabook/theme.php:518
 msgid "Local Directory"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:519 ../../include/contact_widgets.php:35
+#: ../../view/theme/diabook/theme.php:520 ../../include/contact_widgets.php:35
 msgid "Similar Interests"
 msgstr "Podobne zainteresowania"
 
-#: ../../view/theme/diabook/theme.php:521 ../../include/contact_widgets.php:37
+#: ../../view/theme/diabook/theme.php:522 ../../include/contact_widgets.php:37
 msgid "Invite Friends"
 msgstr "Zaproś znajomych"
 
-#: ../../view/theme/diabook/theme.php:572
-#: ../../view/theme/diabook/theme.php:633
+#: ../../view/theme/diabook/theme.php:573
+#: ../../view/theme/diabook/theme.php:634
 #: ../../view/theme/diabook/config.php:164
 msgid "Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:577
+#: ../../view/theme/diabook/theme.php:578
 msgid "Set zoomfactor for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:578
+#: ../../view/theme/diabook/theme.php:579
 #: ../../view/theme/diabook/config.php:161
 msgid "Set longitude (X) for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:579
+#: ../../view/theme/diabook/theme.php:580
 #: ../../view/theme/diabook/config.php:162
 msgid "Set latitude (Y) for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:592
-#: ../../view/theme/diabook/theme.php:635
+#: ../../view/theme/diabook/theme.php:593
+#: ../../view/theme/diabook/theme.php:636
 #: ../../view/theme/diabook/config.php:166
 msgid "Help or @NewHere ?"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:599
-#: ../../view/theme/diabook/theme.php:636
+#: ../../view/theme/diabook/theme.php:600
+#: ../../view/theme/diabook/theme.php:637
 #: ../../view/theme/diabook/config.php:167
 msgid "Connect Services"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:606
-#: ../../view/theme/diabook/theme.php:638
+#: ../../view/theme/diabook/theme.php:607
+#: ../../view/theme/diabook/theme.php:639
 msgid "Last Tweets"
 msgstr "Ostatnie Tweetnięcie"
 
-#: ../../view/theme/diabook/theme.php:609
+#: ../../view/theme/diabook/theme.php:610
 #: ../../view/theme/diabook/config.php:159
 msgid "Set twitter search term"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:629
+#: ../../view/theme/diabook/theme.php:630
 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:313
 msgid "don't show"
 msgstr "nie pokazuj"
 
-#: ../../view/theme/diabook/theme.php:629
+#: ../../view/theme/diabook/theme.php:630
 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:312
 msgid "show"
 msgstr "pokaż"
 
-#: ../../view/theme/diabook/theme.php:630
+#: ../../view/theme/diabook/theme.php:631
 msgid "Show/hide boxes at right-hand column:"
 msgstr ""
 
@@ -8280,11 +8374,11 @@ msgstr "Nie obchodzi mnie to"
 msgid "Ask me"
 msgstr "Zapytaj mnie "
 
-#: ../../include/event.php:20 ../../include/bb2diaspora.php:396
+#: ../../include/event.php:20 ../../include/bb2diaspora.php:399
 msgid "Starts:"
 msgstr ""
 
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:404
+#: ../../include/event.php:30 ../../include/bb2diaspora.php:407
 msgid "Finishes:"
 msgstr "Wykończenia:"
 
@@ -8296,35 +8390,35 @@ msgstr "(bez tematu)"
 msgid " on Last.fm"
 msgstr ""
 
-#: ../../include/text.php:243
+#: ../../include/text.php:263
 msgid "prev"
 msgstr "poprzedni"
 
-#: ../../include/text.php:245
+#: ../../include/text.php:265
 msgid "first"
 msgstr "pierwszy"
 
-#: ../../include/text.php:274
+#: ../../include/text.php:294
 msgid "last"
 msgstr "ostatni"
 
-#: ../../include/text.php:277
+#: ../../include/text.php:297
 msgid "next"
 msgstr "następny"
 
-#: ../../include/text.php:295
+#: ../../include/text.php:315
 msgid "newer"
 msgstr ""
 
-#: ../../include/text.php:299
+#: ../../include/text.php:319
 msgid "older"
 msgstr ""
 
-#: ../../include/text.php:604
+#: ../../include/text.php:658
 msgid "No contacts"
 msgstr "Brak kontaktów"
 
-#: ../../include/text.php:613
+#: ../../include/text.php:667
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
@@ -8332,207 +8426,207 @@ msgstr[0] "%d kontakt"
 msgstr[1] "%d kontaktów"
 msgstr[2] "%d kontakty"
 
-#: ../../include/text.php:726
+#: ../../include/text.php:780
 msgid "poke"
 msgstr "zaczep"
 
-#: ../../include/text.php:726 ../../include/conversation.php:210
+#: ../../include/text.php:780 ../../include/conversation.php:210
 msgid "poked"
 msgstr "zaczepiony"
 
-#: ../../include/text.php:727
+#: ../../include/text.php:781
 msgid "ping"
 msgstr ""
 
-#: ../../include/text.php:727
+#: ../../include/text.php:781
 msgid "pinged"
 msgstr ""
 
-#: ../../include/text.php:728
+#: ../../include/text.php:782
 msgid "prod"
 msgstr ""
 
-#: ../../include/text.php:728
+#: ../../include/text.php:782
 msgid "prodded"
 msgstr ""
 
-#: ../../include/text.php:729
+#: ../../include/text.php:783
 msgid "slap"
 msgstr "spoliczkuj"
 
-#: ../../include/text.php:729
+#: ../../include/text.php:783
 msgid "slapped"
 msgstr "spoliczkowany"
 
-#: ../../include/text.php:730
+#: ../../include/text.php:784
 msgid "finger"
 msgstr "dotknąć"
 
-#: ../../include/text.php:730
+#: ../../include/text.php:784
 msgid "fingered"
 msgstr "dotknięty"
 
-#: ../../include/text.php:731
+#: ../../include/text.php:785
 msgid "rebuff"
 msgstr "odprawiać"
 
-#: ../../include/text.php:731
+#: ../../include/text.php:785
 msgid "rebuffed"
 msgstr "odprawiony"
 
-#: ../../include/text.php:743
+#: ../../include/text.php:797
 msgid "happy"
 msgstr "szczęśliwy"
 
-#: ../../include/text.php:744
+#: ../../include/text.php:798
 msgid "sad"
 msgstr "smutny"
 
-#: ../../include/text.php:745
+#: ../../include/text.php:799
 msgid "mellow"
 msgstr "spokojny"
 
-#: ../../include/text.php:746
+#: ../../include/text.php:800
 msgid "tired"
 msgstr "zmęczony"
 
-#: ../../include/text.php:747
+#: ../../include/text.php:801
 msgid "perky"
 msgstr "pewny siebie"
 
-#: ../../include/text.php:748
+#: ../../include/text.php:802
 msgid "angry"
 msgstr "wściekły"
 
-#: ../../include/text.php:749
+#: ../../include/text.php:803
 msgid "stupified"
 msgstr "odurzony"
 
-#: ../../include/text.php:750
+#: ../../include/text.php:804
 msgid "puzzled"
 msgstr "zdziwiony"
 
-#: ../../include/text.php:751
+#: ../../include/text.php:805
 msgid "interested"
 msgstr "interesujący"
 
-#: ../../include/text.php:752
+#: ../../include/text.php:806
 msgid "bitter"
 msgstr "zajadły"
 
-#: ../../include/text.php:753
+#: ../../include/text.php:807
 msgid "cheerful"
 msgstr "wesoły"
 
-#: ../../include/text.php:754
+#: ../../include/text.php:808
 msgid "alive"
 msgstr "żywy"
 
-#: ../../include/text.php:755
+#: ../../include/text.php:809
 msgid "annoyed"
 msgstr "irytujący"
 
-#: ../../include/text.php:756
+#: ../../include/text.php:810
 msgid "anxious"
 msgstr "zazdrosny"
 
-#: ../../include/text.php:757
+#: ../../include/text.php:811
 msgid "cranky"
 msgstr "zepsuty"
 
-#: ../../include/text.php:758
+#: ../../include/text.php:812
 msgid "disturbed"
 msgstr "przeszkadzający"
 
-#: ../../include/text.php:759
+#: ../../include/text.php:813
 msgid "frustrated"
 msgstr "rozbity"
 
-#: ../../include/text.php:760
+#: ../../include/text.php:814
 msgid "motivated"
 msgstr "zmotywowany"
 
-#: ../../include/text.php:761
+#: ../../include/text.php:815
 msgid "relaxed"
 msgstr "zrelaksowany"
 
-#: ../../include/text.php:762
+#: ../../include/text.php:816
 msgid "surprised"
 msgstr "zaskoczony"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "January"
 msgstr "Styczeń"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "February"
 msgstr "Luty"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "March"
 msgstr "Marzec"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "April"
 msgstr "Kwiecień"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "May"
 msgstr "Maj"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "June"
 msgstr "Czerwiec"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "July"
 msgstr "Lipiec"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "August"
 msgstr "Sierpień"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "September"
 msgstr "Wrzesień"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "October"
 msgstr "Październik"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "November"
 msgstr "Listopad"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "December"
 msgstr "Grudzień"
 
-#: ../../include/text.php:1010
+#: ../../include/text.php:1067
 msgid "bytes"
 msgstr "bajty"
 
-#: ../../include/text.php:1037 ../../include/text.php:1049
+#: ../../include/text.php:1094 ../../include/text.php:1106
 msgid "Click to open/close"
 msgstr "Kliknij aby otworzyć/zamknąć"
 
-#: ../../include/text.php:1222 ../../include/user.php:236
+#: ../../include/text.php:1279 ../../include/user.php:236
 msgid "default"
 msgstr "standardowe"
 
-#: ../../include/text.php:1234
+#: ../../include/text.php:1291
 msgid "Select an alternate language"
 msgstr "Wybierz alternatywny język"
 
-#: ../../include/text.php:1444
+#: ../../include/text.php:1501
 msgid "activity"
 msgstr "aktywność"
 
-#: ../../include/text.php:1447
+#: ../../include/text.php:1504
 msgid "post"
 msgstr "post"
 
-#: ../../include/text.php:1602
+#: ../../include/text.php:1659
 msgid "Item filed"
 msgstr ""
 
@@ -8540,19 +8634,19 @@ msgstr ""
 msgid "Sharing notification from Diaspora network"
 msgstr ""
 
-#: ../../include/diaspora.php:2236
+#: ../../include/diaspora.php:2239
 msgid "Attachments:"
 msgstr "Załączniki:"
 
-#: ../../include/network.php:847
+#: ../../include/network.php:850
 msgid "view full size"
 msgstr "Zobacz pełen rozmiar"
 
-#: ../../include/oembed.php:137
+#: ../../include/oembed.php:138
 msgid "Embedded content"
 msgstr ""
 
-#: ../../include/oembed.php:146
+#: ../../include/oembed.php:147
 msgid "Embedding disabled"
 msgstr "Osadzanie wyłączone"
 
@@ -8628,7 +8722,7 @@ msgstr "Stwórz nową grupę"
 msgid "Contacts not in any group"
 msgstr "Kontakt nie jest w żadnej grupie"
 
-#: ../../include/nav.php:46 ../../boot.php:948
+#: ../../include/nav.php:46 ../../boot.php:975
 msgid "Logout"
 msgstr "Wyloguj się"
 
@@ -8636,7 +8730,7 @@ msgstr "Wyloguj się"
 msgid "End this session"
 msgstr "Zakończ sesję"
 
-#: ../../include/nav.php:49 ../../boot.php:1724
+#: ../../include/nav.php:49 ../../boot.php:1767
 msgid "Status"
 msgstr "Status"
 
@@ -8724,23 +8818,27 @@ msgstr "Zarządzaj"
 msgid "Manage other pages"
 msgstr "Zarządzaj innymi stronami"
 
-#: ../../include/nav.php:140 ../../boot.php:1238
+#: ../../include/nav.php:138
+msgid "Delegations"
+msgstr ""
+
+#: ../../include/nav.php:142 ../../boot.php:1272
 msgid "Profiles"
 msgstr "Profile"
 
-#: ../../include/nav.php:140
+#: ../../include/nav.php:142
 msgid "Manage/Edit Profiles"
 msgstr ""
 
-#: ../../include/nav.php:142
+#: ../../include/nav.php:144
 msgid "Manage/edit friends and contacts"
 msgstr "Zarządzaj listą przyjaciół i kontaktami"
 
-#: ../../include/nav.php:149
+#: ../../include/nav.php:151
 msgid "Site setup and configuration"
 msgstr "Konfiguracja i ustawienia instancji"
 
-#: ../../include/nav.php:173
+#: ../../include/nav.php:175
 msgid "Nothing new here"
 msgstr "Brak nowych zdarzeń"
 
@@ -8804,17 +8902,17 @@ msgstr "Wszystko"
 msgid "Categories"
 msgstr "Kategorie"
 
-#: ../../include/auth.php:36
+#: ../../include/auth.php:38
 msgid "Logged out."
 msgstr "Wyloguj"
 
-#: ../../include/auth.php:126
+#: ../../include/auth.php:128
 msgid ""
 "We encountered a problem while logging in with the OpenID you provided. "
 "Please check the correct spelling of the ID."
 msgstr ""
 
-#: ../../include/auth.php:126
+#: ../../include/auth.php:128
 msgid "The error message was:"
 msgstr ""
 
@@ -8875,29 +8973,32 @@ msgstr "sekundy"
 msgid "%1$d %2$s ago"
 msgstr ""
 
-#: ../../include/datetime.php:472 ../../include/items.php:1695
+#: ../../include/datetime.php:472 ../../include/items.php:1705
 #, php-format
 msgid "%s's birthday"
 msgstr ""
 
-#: ../../include/datetime.php:473 ../../include/items.php:1696
+#: ../../include/datetime.php:473 ../../include/items.php:1706
 #, php-format
 msgid "Happy Birthday %s"
 msgstr ""
 
-#: ../../include/onepoll.php:421
-msgid "From: "
-msgstr "Z:"
-
-#: ../../include/bbcode.php:202 ../../include/bbcode.php:423
+#: ../../include/bbcode.php:210 ../../include/bbcode.php:491
 msgid "Image/photo"
 msgstr "Obrazek/zdjęcie"
 
-#: ../../include/bbcode.php:388 ../../include/bbcode.php:408
+#: ../../include/bbcode.php:262
+#, php-format
+msgid ""
+"<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a "
+"href=\"%s\" target=\"external-link\">post</a>:</span>"
+msgstr ""
+
+#: ../../include/bbcode.php:456 ../../include/bbcode.php:476
 msgid "$1 wrote:"
 msgstr "$1 napisał:"
 
-#: ../../include/bbcode.php:427 ../../include/bbcode.php:428
+#: ../../include/bbcode.php:496 ../../include/bbcode.php:497
 msgid "Encrypted content"
 msgstr ""
 
@@ -9303,15 +9404,15 @@ msgstr "Nie można otrzymać informacji kontaktowych"
 msgid "following"
 msgstr "następujący"
 
-#: ../../include/items.php:3363
+#: ../../include/items.php:3373
 msgid "A new person is sharing with you at "
 msgstr ""
 
-#: ../../include/items.php:3363
+#: ../../include/items.php:3373
 msgid "You have a new follower at "
 msgstr ""
 
-#: ../../include/items.php:4047
+#: ../../include/items.php:4057
 msgid "Archives"
 msgstr "Archiwum"
 
@@ -9405,34 +9506,34 @@ msgstr ""
 msgid "stopped following"
 msgstr "przestań obserwować"
 
-#: ../../include/Contact.php:225 ../../include/conversation.php:795
+#: ../../include/Contact.php:225 ../../include/conversation.php:816
 msgid "Poke"
 msgstr "Zaczepka"
 
-#: ../../include/Contact.php:226 ../../include/conversation.php:789
+#: ../../include/Contact.php:226 ../../include/conversation.php:810
 msgid "View Status"
 msgstr "Zobacz status"
 
-#: ../../include/Contact.php:227 ../../include/conversation.php:790
+#: ../../include/Contact.php:227 ../../include/conversation.php:811
 msgid "View Profile"
 msgstr "Zobacz profil"
 
-#: ../../include/Contact.php:228 ../../include/conversation.php:791
+#: ../../include/Contact.php:228 ../../include/conversation.php:812
 msgid "View Photos"
 msgstr "Zobacz zdjęcia"
 
 #: ../../include/Contact.php:229 ../../include/Contact.php:242
-#: ../../include/conversation.php:792
+#: ../../include/conversation.php:813
 msgid "Network Posts"
 msgstr ""
 
 #: ../../include/Contact.php:230 ../../include/Contact.php:242
-#: ../../include/conversation.php:793
+#: ../../include/conversation.php:814
 msgid "Edit Contact"
 msgstr "Edytuj kontakt"
 
 #: ../../include/Contact.php:231 ../../include/Contact.php:242
-#: ../../include/conversation.php:794
+#: ../../include/conversation.php:815
 msgid "Send PM"
 msgstr "Wyślij prywatną wiadomość"
 
@@ -9450,90 +9551,92 @@ msgstr ""
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 
-#: ../../include/conversation.php:599 ../../object/Item.php:226
+#: ../../include/conversation.php:620 ../../object/Item.php:243
 msgid "Categories:"
 msgstr "Kategorie:"
 
-#: ../../include/conversation.php:600 ../../object/Item.php:227
+#: ../../include/conversation.php:621 ../../object/Item.php:244
 msgid "Filed under:"
 msgstr ""
 
-#: ../../include/conversation.php:685
+#: ../../include/conversation.php:706
 msgid "remove"
 msgstr "usuń"
 
-#: ../../include/conversation.php:689
+#: ../../include/conversation.php:710
 msgid "Delete Selected Items"
 msgstr "Usuń zaznaczone elementy"
 
-#: ../../include/conversation.php:788
+#: ../../include/conversation.php:809
 msgid "Follow Thread"
 msgstr ""
 
-#: ../../include/conversation.php:857
+#: ../../include/conversation.php:878
 #, php-format
 msgid "%s likes this."
 msgstr "%s lubi to."
 
-#: ../../include/conversation.php:857
+#: ../../include/conversation.php:878
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s nie lubi tego."
 
-#: ../../include/conversation.php:861
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this."
-msgstr "<span %1$s>%2$d people</span> lubię to."
+#: ../../include/conversation.php:884
+msgid "like this"
+msgstr ""
 
-#: ../../include/conversation.php:863
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this."
-msgstr "<span %1$s>%2$d people</span> nie lubię tego"
+#: ../../include/conversation.php:888
+msgid "don't like this"
+msgstr ""
 
-#: ../../include/conversation.php:869
+#: ../../include/conversation.php:895
+msgid "people"
+msgstr ""
+
+#: ../../include/conversation.php:905
 msgid "and"
 msgstr "i"
 
-#: ../../include/conversation.php:875
+#: ../../include/conversation.php:911
 #, php-format
 msgid ", and %d other people"
 msgstr ", i %d innych ludzi"
 
-#: ../../include/conversation.php:877
+#: ../../include/conversation.php:913
 #, php-format
 msgid "%s like this."
 msgstr "%s lubi to."
 
-#: ../../include/conversation.php:877
+#: ../../include/conversation.php:913
 #, php-format
 msgid "%s don't like this."
 msgstr "%s nie lubi tego."
 
-#: ../../include/conversation.php:904 ../../include/conversation.php:922
+#: ../../include/conversation.php:940 ../../include/conversation.php:958
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Widoczne dla <strong>wszystkich</strong>"
 
-#: ../../include/conversation.php:906 ../../include/conversation.php:924
+#: ../../include/conversation.php:942 ../../include/conversation.php:960
 msgid "Please enter a video link/URL:"
 msgstr "Podaj link do filmu"
 
-#: ../../include/conversation.php:907 ../../include/conversation.php:925
+#: ../../include/conversation.php:943 ../../include/conversation.php:961
 msgid "Please enter an audio link/URL:"
 msgstr "Podaj link do muzyki"
 
-#: ../../include/conversation.php:908 ../../include/conversation.php:926
+#: ../../include/conversation.php:944 ../../include/conversation.php:962
 msgid "Tag term:"
 msgstr ""
 
-#: ../../include/conversation.php:910 ../../include/conversation.php:928
+#: ../../include/conversation.php:946 ../../include/conversation.php:964
 msgid "Where are you right now?"
 msgstr "Gdzie teraz jesteś?"
 
-#: ../../include/conversation.php:911
+#: ../../include/conversation.php:947
 msgid "Delete item(s)?"
 msgstr ""
 
-#: ../../include/conversation.php:990
+#: ../../include/conversation.php:1026
 msgid "permissions"
 msgstr "zezwolenia"
 
@@ -9549,113 +9652,129 @@ msgstr ""
 msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../boot.php:607
+#: ../../boot.php:634
 msgid "Delete this item?"
 msgstr "Usunąć ten element?"
 
-#: ../../boot.php:610
+#: ../../boot.php:637
 msgid "show fewer"
 msgstr "Pokaż mniej"
 
-#: ../../boot.php:819
+#: ../../boot.php:847
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:821
+#: ../../boot.php:849
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:922
+#: ../../boot.php:950
 msgid "Create a New Account"
 msgstr "Załóż nowe konto"
 
-#: ../../boot.php:951
+#: ../../boot.php:978
 msgid "Nickname or Email address: "
 msgstr "Nick lub adres email:"
 
-#: ../../boot.php:952
+#: ../../boot.php:979
 msgid "Password: "
 msgstr "Hasło:"
 
-#: ../../boot.php:953
+#: ../../boot.php:980
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:956
+#: ../../boot.php:983
 msgid "Or login using OpenID: "
 msgstr "Lub zaloguj się korzystając z OpenID:"
 
-#: ../../boot.php:962
+#: ../../boot.php:989
 msgid "Forgot your password?"
 msgstr "Zapomniałeś swojego hasła?"
 
-#: ../../boot.php:1087
+#: ../../boot.php:992
+msgid "Website Terms of Service"
+msgstr ""
+
+#: ../../boot.php:993
+msgid "terms of service"
+msgstr ""
+
+#: ../../boot.php:995
+msgid "Website Privacy Policy"
+msgstr ""
+
+#: ../../boot.php:996
+msgid "privacy policy"
+msgstr ""
+
+#: ../../boot.php:1121
 msgid "Requested account is not available."
 msgstr ""
 
-#: ../../boot.php:1164
+#: ../../boot.php:1198
 msgid "Edit profile"
 msgstr "Edytuj profil"
 
-#: ../../boot.php:1230
+#: ../../boot.php:1264
 msgid "Message"
 msgstr "Wiadomość"
 
-#: ../../boot.php:1238
+#: ../../boot.php:1272
 msgid "Manage/edit profiles"
 msgstr "Zarządzaj profilami"
 
-#: ../../boot.php:1352 ../../boot.php:1438
+#: ../../boot.php:1395 ../../boot.php:1481
 msgid "g A l F d"
 msgstr ""
 
-#: ../../boot.php:1353 ../../boot.php:1439
+#: ../../boot.php:1396 ../../boot.php:1482
 msgid "F d"
 msgstr ""
 
-#: ../../boot.php:1398 ../../boot.php:1479
+#: ../../boot.php:1441 ../../boot.php:1522
 msgid "[today]"
 msgstr "[dziś]"
 
-#: ../../boot.php:1410
+#: ../../boot.php:1453
 msgid "Birthday Reminders"
 msgstr "Przypomnienia o urodzinach"
 
-#: ../../boot.php:1411
+#: ../../boot.php:1454
 msgid "Birthdays this week:"
 msgstr "Urodziny w tym tygodniu:"
 
-#: ../../boot.php:1472
+#: ../../boot.php:1515
 msgid "[No description]"
 msgstr "[Brak opisu]"
 
-#: ../../boot.php:1490
+#: ../../boot.php:1533
 msgid "Event Reminders"
 msgstr "Przypominacze wydarzeń"
 
-#: ../../boot.php:1491
+#: ../../boot.php:1534
 msgid "Events this week:"
 msgstr "Wydarzenia w tym tygodniu:"
 
-#: ../../boot.php:1727
+#: ../../boot.php:1770
 msgid "Status Messages and Posts"
 msgstr "Status wiadomości i postów"
 
-#: ../../boot.php:1734
+#: ../../boot.php:1777
 msgid "Profile Details"
 msgstr "Szczegóły profilu"
 
-#: ../../boot.php:1751
+#: ../../boot.php:1794
 msgid "Events and Calendar"
 msgstr "Wydarzenia i kalendarz"
 
-#: ../../boot.php:1758
+#: ../../boot.php:1801
 msgid "Only You Can See This"
 msgstr "Tylko ty możesz to zobaczyć"
 
-#: ../../object/Item.php:238
+#: ../../object/Item.php:255
 msgid "via"
 msgstr ""
 
diff --git a/view/pl/smarty3/follow_notify_eml.tpl b/view/pl/smarty3/follow_notify_eml.tpl
index 0fdbbf49fe..50058ee93b 100644
--- a/view/pl/smarty3/follow_notify_eml.tpl
+++ b/view/pl/smarty3/follow_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Drogi {{$myname}},
 
diff --git a/view/pl/smarty3/friend_complete_eml.tpl b/view/pl/smarty3/friend_complete_eml.tpl
index 12918b6b69..bfa196ed07 100644
--- a/view/pl/smarty3/friend_complete_eml.tpl
+++ b/view/pl/smarty3/friend_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Drogi {{$username}},
 
diff --git a/view/pl/smarty3/intro_complete_eml.tpl b/view/pl/smarty3/intro_complete_eml.tpl
index 55dc1d78ea..0463861d59 100644
--- a/view/pl/smarty3/intro_complete_eml.tpl
+++ b/view/pl/smarty3/intro_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Drogi {{$username}},
 
diff --git a/view/pl/smarty3/lostpass_eml.tpl b/view/pl/smarty3/lostpass_eml.tpl
index 7d5240cfa3..c4c69a13ff 100644
--- a/view/pl/smarty3/lostpass_eml.tpl
+++ b/view/pl/smarty3/lostpass_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 {{$username}},
 	Ze strony {{$sitename}} wpłynęła prośba z zresetowanie 
diff --git a/view/pl/smarty3/passchanged_eml.tpl b/view/pl/smarty3/passchanged_eml.tpl
index b8ba39cdf6..20d6524850 100644
--- a/view/pl/smarty3/passchanged_eml.tpl
+++ b/view/pl/smarty3/passchanged_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Drogi {{$username}},
 	Twoje hasło zostało zmienione. Zachowaj tę 
diff --git a/view/pl/smarty3/register_open_eml.tpl b/view/pl/smarty3/register_open_eml.tpl
index 604ebfacc3..3a56f3c149 100644
--- a/view/pl/smarty3/register_open_eml.tpl
+++ b/view/pl/smarty3/register_open_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Drogi {{$username}},
 	Dziękujemy za rejestrację na {{$sitename}}. Twoje konto zostało utworzone pomyślnie.  
diff --git a/view/pl/smarty3/register_verify_eml.tpl b/view/pl/smarty3/register_verify_eml.tpl
index 017e0ec0be..ed7df4471c 100644
--- a/view/pl/smarty3/register_verify_eml.tpl
+++ b/view/pl/smarty3/register_verify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Nowy wniosek o rejestrację użytkownika wpłynął na {{$sitename}} i wymaga 
 potwierdzenia. 
diff --git a/view/pl/smarty3/request_notify_eml.tpl b/view/pl/smarty3/request_notify_eml.tpl
index ea31ca8769..dfa978ee38 100644
--- a/view/pl/smarty3/request_notify_eml.tpl
+++ b/view/pl/smarty3/request_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Drogi/a {{$myname}},
 
diff --git a/view/pl/smarty3/update_fail_eml.tpl b/view/pl/smarty3/update_fail_eml.tpl
index 809fd552ec..02fe940885 100644
--- a/view/pl/smarty3/update_fail_eml.tpl
+++ b/view/pl/smarty3/update_fail_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Hey,  
 Jestem {{$sitename}}.   
 Deweloperzy friendica wydali ostatnio aktualizację {{$update}}, 
diff --git a/view/pl/strings.php b/view/pl/strings.php
index aae3aee4c2..29ded278da 100644
--- a/view/pl/strings.php
+++ b/view/pl/strings.php
@@ -258,9 +258,14 @@ $a->strings["This is most often a permission setting, as the web server may not
 $a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder."] = "";
 $a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "";
 $a->strings[".htconfig.php is writable"] = "";
+$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "";
+$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "";
+$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "";
+$a->strings["Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains."] = "";
+$a->strings["view/smarty3 is writable"] = "";
 $a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "";
 $a->strings["Url rewrite is working"] = "";
-$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "";
+$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Konfiguracja bazy danych pliku \".htconfig.php\" nie mogła zostać zapisana. Proszę użyć załączonego tekstu, aby utworzyć folder konfiguracyjny w sieci serwera.";
 $a->strings["Errors encountered creating database tables."] = "Zostały napotkane błędy przy tworzeniu tabeli bazy danych.";
 $a->strings["<h1>What next</h1>"] = "";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "";
@@ -495,7 +500,7 @@ $a->strings["StatusNet"] = "";
 $a->strings["Email access is disabled on this site."] = "Dostęp do e-maila nie jest w pełni sprawny na tej stronie";
 $a->strings["Connector Settings"] = "Ustawienia konektora";
 $a->strings["Email/Mailbox Setup"] = "Ustawienia  emaila/skrzynki mailowej";
-$a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "";
+$a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "Jeżeli życzysz sobie komunikowania z kontaktami email używając tego serwisu (opcjonalne), opisz jak połaczyć się z Twoją skrzynką email.";
 $a->strings["Last successful email check:"] = "Ostatni sprawdzony e-mail:";
 $a->strings["IMAP server name:"] = "Nazwa serwera IMAP:";
 $a->strings["IMAP port:"] = "Port IMAP:";
@@ -583,7 +588,7 @@ $a->strings["You are tagged in a post"] = "Jesteś oznaczony w poście";
 $a->strings["You are poked/prodded/etc. in a post"] = "";
 $a->strings["Advanced Account/Page Type Settings"] = "";
 $a->strings["Change the behaviour of this account for special situations"] = "";
-$a->strings["Manage Identities and/or Pages"] = "";
+$a->strings["Manage Identities and/or Pages"] = "Zarządzaj Tożsamościami i/lub Stronami.";
 $a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "";
 $a->strings["Select an identity to manage: "] = "Wybierz tożsamość do zarządzania:";
 $a->strings["Search Results For:"] = "Szukaj wyników dla:";
@@ -615,7 +620,9 @@ $a->strings["Save"] = "Zapisz";
 $a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Strona przekroczyła ilość dozwolonych rejestracji na dzień. Proszę spróbuj ponownie jutro.";
 $a->strings["Import"] = "";
 $a->strings["Move account"] = "";
-$a->strings["You can import an account from another Friendica server. <br>\r\n                            You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here.<br>\r\n                            <b>This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from diaspora"] = "";
+$a->strings["You can import an account from another Friendica server."] = "";
+$a->strings["You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."] = "";
+$a->strings["This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from Diaspora"] = "";
 $a->strings["Account file"] = "";
 $a->strings["To export your accont, go to \"Settings->Export your porsonal data\" and select \"Export account\""] = "";
 $a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "";
@@ -693,7 +700,7 @@ $a->strings["Failed to send email message. Here is the message that failed."] =
 $a->strings["Your registration can not be processed."] = "Twoja rejestracja nie może zostać przeprowadzona. ";
 $a->strings["Registration request at %s"] = "Prośba o rejestrację u %s";
 $a->strings["Your registration is pending approval by the site owner."] = "Twoja rejestracja oczekuje na zaakceptowanie przez właściciela witryny.";
-$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "";
+$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Masz możliwość (opcjonalnie) wypełnić ten formularz przez OpenID poprzez załączenie Twojego OpenID i kliknięcie 'Zarejestruj'.";
 $a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Jeśli nie jesteś zaznajomiony z OpenID, zostaw to pole puste i uzupełnij resztę elementów.";
 $a->strings["Your OpenID (optional): "] = "Twój OpenID (opcjonalnie):";
 $a->strings["Include your profile in member directory?"] = "Czy dołączyć twój profil do katalogu członków?";
@@ -800,6 +807,7 @@ $a->strings["Self-signed certificate, use SSL for local links only (discouraged)
 $a->strings["File upload"] = "Plik załadowano";
 $a->strings["Policies"] = "zasady";
 $a->strings["Advanced"] = "Zaawansowany";
+$a->strings["Performance"] = "";
 $a->strings["Site name"] = "Nazwa strony";
 $a->strings["Banner/Logo"] = "Logo";
 $a->strings["System language"] = "Język systemu";
@@ -809,6 +817,8 @@ $a->strings["Mobile system theme"] = "";
 $a->strings["Theme for mobile devices"] = "";
 $a->strings["SSL link policy"] = "";
 $a->strings["Determines whether generated links should be forced to use SSL"] = "";
+$a->strings["'Share' element"] = "";
+$a->strings["Activates the bbcode element 'share' for repeating items."] = "";
 $a->strings["Maximum image size"] = "Maksymalny rozmiar zdjęcia";
 $a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "";
 $a->strings["Maximum image length"] = "Maksymalna długość obrazu";
@@ -864,6 +874,14 @@ $a->strings["Poll interval"] = "";
 $a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "";
 $a->strings["Maximum Load Average"] = "";
 $a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "";
+$a->strings["Use MySQL full text engine"] = "";
+$a->strings["Activates the full text engine. Speeds up search - but can only search for four and more characters."] = "";
+$a->strings["Path to item cache"] = "";
+$a->strings["Cache duration in seconds"] = "";
+$a->strings["How long should the cache files be hold? Default value is 86400 seconds (One day)."] = "";
+$a->strings["Path for lock file"] = "";
+$a->strings["Temp path"] = "";
+$a->strings["Base path to installation"] = "";
 $a->strings["Update has been marked successful"] = "";
 $a->strings["Executing %s failed. Check system logs."] = "";
 $a->strings["Update %s was successfully applied."] = "";
@@ -1091,7 +1109,7 @@ $a->strings["Our site encryption key is apparently messed up."] = "Klucz kodują
 $a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "Został dostarczony pusty URL lub nie może zostać rozszyfrowany przez nas.";
 $a->strings["Contact record was not found for you on our site."] = "Nie znaleziono kontaktu na naszej stronie";
 $a->strings["Site public key not available in contact record for URL %s."] = "";
-$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "";
+$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "ID dostarczone przez Twój system jest już w naszeym systemie. Powinno zadziałać jeżeli spróbujesz ponownie.";
 $a->strings["Unable to set your contact credentials on our system."] = "Niezdolny do ustalenie tożsamości twoich kontaktów w naszym systemie";
 $a->strings["Unable to update your contact profile details on our system"] = "Niezdolny do aktualizacji szczegółowych danych profilowych twoich kontaktów w naszym systemie";
 $a->strings["Connection accepted at %s"] = "Połączenie zaakceptowane %s";
@@ -1157,6 +1175,7 @@ $a->strings["Remove Facebook Post connector"] = "";
 $a->strings["Suppress \"View on friendica\""] = "";
 $a->strings["Post to page/group:"] = "Napisz na stronę/grupę:";
 $a->strings["Facebook Post Settings"] = "Ustawienia wpisu z Facebooka";
+$a->strings["%s:"] = "";
 $a->strings["%d person likes this"] = array(
 	0 => " %d osoba lubi to",
 	1 => " %d osób lubi to",
@@ -1876,6 +1895,7 @@ $a->strings["Inbox"] = "Odebrane";
 $a->strings["Outbox"] = "Wysłane";
 $a->strings["Manage"] = "Zarządzaj";
 $a->strings["Manage other pages"] = "Zarządzaj innymi stronami";
+$a->strings["Delegations"] = "";
 $a->strings["Profiles"] = "Profile";
 $a->strings["Manage/Edit Profiles"] = "";
 $a->strings["Manage/edit friends and contacts"] = "Zarządzaj listą przyjaciół i kontaktami";
@@ -1918,8 +1938,8 @@ $a->strings["seconds"] = "sekundy";
 $a->strings["%1\$d %2\$s ago"] = "";
 $a->strings["%s's birthday"] = "";
 $a->strings["Happy Birthday %s"] = "";
-$a->strings["From: "] = "Z:";
 $a->strings["Image/photo"] = "Obrazek/zdjęcie";
+$a->strings["<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a href=\"%s\" target=\"external-link\">post</a>:</span>"] = "";
 $a->strings["$1 wrote:"] = "$1 napisał:";
 $a->strings["Encrypted content"] = "";
 $a->strings["General Features"] = "";
@@ -2053,8 +2073,9 @@ $a->strings["Delete Selected Items"] = "Usuń zaznaczone elementy";
 $a->strings["Follow Thread"] = "";
 $a->strings["%s likes this."] = "%s lubi to.";
 $a->strings["%s doesn't like this."] = "%s nie lubi tego.";
-$a->strings["<span  %1\$s>%2\$d people</span> like this."] = "<span %1\$s>%2\$d people</span> lubię to.";
-$a->strings["<span  %1\$s>%2\$d people</span> don't like this."] = "<span %1\$s>%2\$d people</span> nie lubię tego";
+$a->strings["like this"] = "";
+$a->strings["don't like this"] = "";
+$a->strings["people"] = "";
 $a->strings["and"] = "i";
 $a->strings[", and %d other people"] = ", i %d innych ludzi";
 $a->strings["%s like this."] = "%s lubi to.";
@@ -2079,6 +2100,10 @@ $a->strings["Password: "] = "Hasło:";
 $a->strings["Remember me"] = "";
 $a->strings["Or login using OpenID: "] = "Lub zaloguj się korzystając z OpenID:";
 $a->strings["Forgot your password?"] = "Zapomniałeś swojego hasła?";
+$a->strings["Website Terms of Service"] = "";
+$a->strings["terms of service"] = "";
+$a->strings["Website Privacy Policy"] = "";
+$a->strings["privacy policy"] = "";
 $a->strings["Requested account is not available."] = "";
 $a->strings["Edit profile"] = "Edytuj profil";
 $a->strings["Message"] = "Wiadomość";
diff --git a/view/poco_xml.tpl b/view/poco_xml.tpl
index 394f6afcf8..9549b695d1 100644
--- a/view/poco_xml.tpl
+++ b/view/poco_xml.tpl
@@ -9,8 +9,8 @@
 
 
 {{ if $response.totalResults }}
-{{ for $response.entry as $ent }}
-{{ inc poco_entry_xml.tpl with $entry=$ent }}{{ endinc }}
+{{ for $response.entry as $entry }}
+{{ inc poco_entry_xml.tpl }}{{ endinc }}
 {{ endfor }}
 {{ else }}
 <entry></entry>
diff --git a/view/pt-br/smarty3/intro_complete_eml.tpl b/view/pt-br/smarty3/intro_complete_eml.tpl
index 3689d653c2..efe1e6b5ac 100644
--- a/view/pt-br/smarty3/intro_complete_eml.tpl
+++ b/view/pt-br/smarty3/intro_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Prezado/a {{$username}},
 
diff --git a/view/pt-br/smarty3/update_fail_eml.tpl b/view/pt-br/smarty3/update_fail_eml.tpl
index f8f5e2ef20..fbf123475b 100644
--- a/view/pt-br/smarty3/update_fail_eml.tpl
+++ b/view/pt-br/smarty3/update_fail_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Oi, 
 Eu sou {{$sitename}}   
 Os desenvolvedores do friendica lançaram uma atualização {{$update}} recentemente, 
diff --git a/view/register.tpl b/view/register.tpl
index 7cf11881ad..2275356a21 100644
--- a/view/register.tpl
+++ b/view/register.tpl
@@ -11,10 +11,12 @@
 	<p id="register-fill-desc">$fillwith</p>
 	<p id="register-fill-ext">$fillext</p>
 
+{{ if $oidlabel }}
 	<div id="register-openid-wrapper" >
-			$oidhtml
+    	<label for="register-openid" id="label-register-openid" >$oidlabel</label><input 	type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="$openid" >
 	</div>
 	<div id="register-openid-end" ></div>
+{{ endif }}
 
 {{ if $invitations }}
 
diff --git a/view/smarty3/404.tpl b/view/smarty3/404.tpl
index 518ad1d290..2d581ab8da 100644
--- a/view/smarty3/404.tpl
+++ b/view/smarty3/404.tpl
@@ -1 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$message}}</h1>
diff --git a/view/smarty3/acl_selector.tpl b/view/smarty3/acl_selector.tpl
index e9f8030d7c..5fd11e7569 100644
--- a/view/smarty3/acl_selector.tpl
+++ b/view/smarty3/acl_selector.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="acl-wrapper">
 	<input id="acl-search">
 	<a href="#" id="acl-showall">{{$showall}}</a>
diff --git a/view/smarty3/admin_aside.tpl b/view/smarty3/admin_aside.tpl
index a9d26a89f0..24f07e28e6 100644
--- a/view/smarty3/admin_aside.tpl
+++ b/view/smarty3/admin_aside.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script>
 	// update pending count //
 	$(function(){
diff --git a/view/smarty3/admin_logs.tpl b/view/smarty3/admin_logs.tpl
index e5412429f4..6a2259500c 100644
--- a/view/smarty3/admin_logs.tpl
+++ b/view/smarty3/admin_logs.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
 	
diff --git a/view/smarty3/admin_plugins.tpl b/view/smarty3/admin_plugins.tpl
index 01c178c3eb..307814e875 100644
--- a/view/smarty3/admin_plugins.tpl
+++ b/view/smarty3/admin_plugins.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
 	
diff --git a/view/smarty3/admin_plugins_details.tpl b/view/smarty3/admin_plugins_details.tpl
index 47c33bec3c..e817017328 100644
--- a/view/smarty3/admin_plugins_details.tpl
+++ b/view/smarty3/admin_plugins_details.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
 	
diff --git a/view/smarty3/admin_remoteupdate.tpl b/view/smarty3/admin_remoteupdate.tpl
index 6260741ed7..cee0ef9b8d 100644
--- a/view/smarty3/admin_remoteupdate.tpl
+++ b/view/smarty3/admin_remoteupdate.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script src="js/jquery.htmlstream.js"></script>
 <script>
 	/* ajax updater */
diff --git a/view/smarty3/admin_site.tpl b/view/smarty3/admin_site.tpl
index 79e68a40c8..2ff63ec2e7 100644
--- a/view/smarty3/admin_site.tpl
+++ b/view/smarty3/admin_site.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script>
 	$(function(){
 		
diff --git a/view/smarty3/admin_summary.tpl b/view/smarty3/admin_summary.tpl
index 339dbddb63..b3b42a1392 100644
--- a/view/smarty3/admin_summary.tpl
+++ b/view/smarty3/admin_summary.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
 
diff --git a/view/smarty3/admin_users.tpl b/view/smarty3/admin_users.tpl
index 5658fc7e54..7ecef1a56c 100644
--- a/view/smarty3/admin_users.tpl
+++ b/view/smarty3/admin_users.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script>
 	function confirm_delete(uname){
 		return confirm( "{{$confirm_delete}}".format(uname));
diff --git a/view/smarty3/album_edit.tpl b/view/smarty3/album_edit.tpl
index 61653c47cd..36c07a9f08 100644
--- a/view/smarty3/album_edit.tpl
+++ b/view/smarty3/album_edit.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="photo-album-edit-wrapper">
 <form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/{{$nickname}}/album/{{$hexalbum}}" method="post" >
 
diff --git a/view/smarty3/api_config_xml.tpl b/view/smarty3/api_config_xml.tpl
index 8c0766c739..09aa00ac44 100644
--- a/view/smarty3/api_config_xml.tpl
+++ b/view/smarty3/api_config_xml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <config>
  <site>
   <name>{{$config.site.name}}</name>
diff --git a/view/smarty3/api_friends_xml.tpl b/view/smarty3/api_friends_xml.tpl
index d3a2181420..c89b96de56 100644
--- a/view/smarty3/api_friends_xml.tpl
+++ b/view/smarty3/api_friends_xml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!-- TEMPLATE APPEARS UNUSED -->
 
 <users type="array">
diff --git a/view/smarty3/api_ratelimit_xml.tpl b/view/smarty3/api_ratelimit_xml.tpl
index e4b470a255..a34eb67234 100644
--- a/view/smarty3/api_ratelimit_xml.tpl
+++ b/view/smarty3/api_ratelimit_xml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <hash>
  <remaining-hits type="integer">{{$hash.remaining_hits}}</remaining-hits>
  <hourly-limit type="integer">{{$hash.hourly_limit}}</hourly-limit>
diff --git a/view/smarty3/api_status_xml.tpl b/view/smarty3/api_status_xml.tpl
index cbb736e22e..e3e80d2b1c 100644
--- a/view/smarty3/api_status_xml.tpl
+++ b/view/smarty3/api_status_xml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <status>{{if $status}}
     <created_at>{{$status.created_at}}</created_at>
     <id>{{$status.id}}</id>
diff --git a/view/smarty3/api_test_xml.tpl b/view/smarty3/api_test_xml.tpl
index 80a541c39c..df5009af5c 100644
--- a/view/smarty3/api_test_xml.tpl
+++ b/view/smarty3/api_test_xml.tpl
@@ -1 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <ok>{{$ok}}</ok>
diff --git a/view/smarty3/api_timeline_atom.tpl b/view/smarty3/api_timeline_atom.tpl
index 4baed16045..b23acacb3f 100644
--- a/view/smarty3/api_timeline_atom.tpl
+++ b/view/smarty3/api_timeline_atom.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:georss="http://www.georss.org/georss" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:media="http://purl.org/syndication/atommedia" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:statusnet="http://status.net/schema/api/1/">
  <generator uri="http://status.net" version="0.9.7">StatusNet</generator>
  <id>{{$rss.self}}</id>
diff --git a/view/smarty3/api_timeline_rss.tpl b/view/smarty3/api_timeline_rss.tpl
index 075cc83483..e89c7d0803 100644
--- a/view/smarty3/api_timeline_rss.tpl
+++ b/view/smarty3/api_timeline_rss.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0" xmlns:georss="http://www.georss.org/georss" xmlns:twitter="http://api.twitter.com">
   <channel>
     <title>Friendica</title>
diff --git a/view/smarty3/api_timeline_xml.tpl b/view/smarty3/api_timeline_xml.tpl
index f14d73e9c0..84148d17ff 100644
--- a/view/smarty3/api_timeline_xml.tpl
+++ b/view/smarty3/api_timeline_xml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <statuses type="array" xmlns:statusnet="http://status.net/schema/api/1/">
 {{foreach $statuses as $status}} <status>
   <text>{{$status.text}}</text>
diff --git a/view/smarty3/api_user_xml.tpl b/view/smarty3/api_user_xml.tpl
index 3b51992f60..d7efcf3fb0 100644
--- a/view/smarty3/api_user_xml.tpl
+++ b/view/smarty3/api_user_xml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
   <user>
    <id>{{$user.id}}</id>
    <name>{{$user.name}}</name>
diff --git a/view/smarty3/apps.tpl b/view/smarty3/apps.tpl
index 335e0ca977..01d9bb8c82 100644
--- a/view/smarty3/apps.tpl
+++ b/view/smarty3/apps.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h3>{{$title}}</h3>
 
 <ul>
diff --git a/view/smarty3/atom_feed.tpl b/view/smarty3/atom_feed.tpl
index ccb85a48a5..db553d99f4 100644
--- a/view/smarty3/atom_feed.tpl
+++ b/view/smarty3/atom_feed.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?xml version="1.0" encoding="utf-8" ?>
 <feed xmlns="http://www.w3.org/2005/Atom"
       xmlns:thr="http://purl.org/syndication/thread/1.0"
diff --git a/view/smarty3/atom_feed_dfrn.tpl b/view/smarty3/atom_feed_dfrn.tpl
index 307001fbef..87d78a5186 100644
--- a/view/smarty3/atom_feed_dfrn.tpl
+++ b/view/smarty3/atom_feed_dfrn.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?xml version="1.0" encoding="utf-8" ?>
 <feed xmlns="http://www.w3.org/2005/Atom"
       xmlns:thr="http://purl.org/syndication/thread/1.0"
diff --git a/view/smarty3/atom_mail.tpl b/view/smarty3/atom_mail.tpl
index 9b843f5851..adf75a3e7a 100644
--- a/view/smarty3/atom_mail.tpl
+++ b/view/smarty3/atom_mail.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <dfrn:mail>
 
diff --git a/view/smarty3/atom_relocate.tpl b/view/smarty3/atom_relocate.tpl
index 78fdd7fadb..073edeaf53 100644
--- a/view/smarty3/atom_relocate.tpl
+++ b/view/smarty3/atom_relocate.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <dfrn:relocate>
 
diff --git a/view/smarty3/atom_suggest.tpl b/view/smarty3/atom_suggest.tpl
index 972b9bc0b3..c0d1a1b3c9 100644
--- a/view/smarty3/atom_suggest.tpl
+++ b/view/smarty3/atom_suggest.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <dfrn:suggest>
 
diff --git a/view/smarty3/auto_request.tpl b/view/smarty3/auto_request.tpl
index dfc5a4c80c..662ca2447e 100644
--- a/view/smarty3/auto_request.tpl
+++ b/view/smarty3/auto_request.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h1>{{$header}}</h1>
 
diff --git a/view/smarty3/birthdays_reminder.tpl b/view/smarty3/birthdays_reminder.tpl
index 672e77aec2..695364cdad 100644
--- a/view/smarty3/birthdays_reminder.tpl
+++ b/view/smarty3/birthdays_reminder.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $count}}
 <div id="birthday-notice" class="birthday-notice fakelink {{$classtoday}}" onclick="openClose('birthday-wrapper');">{{$event_reminders}} ({{$count}})</div>
 <div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">{{$event_title}}</div>
diff --git a/view/smarty3/categories_widget.tpl b/view/smarty3/categories_widget.tpl
index 10d4d2f83b..ab10ef9287 100644
--- a/view/smarty3/categories_widget.tpl
+++ b/view/smarty3/categories_widget.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="categories-sidebar" class="widget">
 	<h3>{{$title}}</h3>
 	<div id="nets-desc">{{$desc}}</div>
diff --git a/view/smarty3/comment_item.tpl b/view/smarty3/comment_item.tpl
index 8e5c0ef4cf..40a3e30ad2 100644
--- a/view/smarty3/comment_item.tpl
+++ b/view/smarty3/comment_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 		{{if $threaded}}
 		<div class="comment-wwedit-wrapper threaded" id="comment-edit-wrapper-{{$id}}" style="display: block;">
 		{{else}}
diff --git a/view/smarty3/common_friends.tpl b/view/smarty3/common_friends.tpl
index 9adb30b714..499cfe6261 100644
--- a/view/smarty3/common_friends.tpl
+++ b/view/smarty3/common_friends.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="profile-match-wrapper">
 	<div class="profile-match-photo">
 		<a href="{{$url}}">
diff --git a/view/smarty3/common_tabs.tpl b/view/smarty3/common_tabs.tpl
index be36459665..69fa377bc9 100644
--- a/view/smarty3/common_tabs.tpl
+++ b/view/smarty3/common_tabs.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <ul class="tabs">
 	{{foreach $tabs as $tab}}
 		<li id="{{$tab.id}}"><a href="{{$tab.url}}" class="tab button {{$tab.sel}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
diff --git a/view/smarty3/contact_block.tpl b/view/smarty3/contact_block.tpl
index e688af287a..e1d98c3bb0 100644
--- a/view/smarty3/contact_block.tpl
+++ b/view/smarty3/contact_block.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="contact-block">
 <h4 class="contact-block-h4">{{$contacts}}</h4>
 {{if $micropro}}
diff --git a/view/smarty3/contact_edit.tpl b/view/smarty3/contact_edit.tpl
index 4f65f76a3e..5ba2abe721 100644
--- a/view/smarty3/contact_edit.tpl
+++ b/view/smarty3/contact_edit.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h2>{{$header}}</h2>
 
diff --git a/view/smarty3/contact_end.tpl b/view/smarty3/contact_end.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/smarty3/contact_end.tpl
+++ b/view/smarty3/contact_end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/smarty3/contact_head.tpl b/view/smarty3/contact_head.tpl
index 72e7edbfb9..27bc286b15 100644
--- a/view/smarty3/contact_head.tpl
+++ b/view/smarty3/contact_head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script language="javascript" type="text/javascript"
           src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
           <script language="javascript" type="text/javascript">
diff --git a/view/smarty3/contact_template.tpl b/view/smarty3/contact_template.tpl
index 790431a9f3..8143a82808 100644
--- a/view/smarty3/contact_template.tpl
+++ b/view/smarty3/contact_template.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" >
 	<div class="contact-entry-photo-wrapper" >
diff --git a/view/smarty3/contacts-end.tpl b/view/smarty3/contacts-end.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/smarty3/contacts-end.tpl
+++ b/view/smarty3/contacts-end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/smarty3/contacts-head.tpl b/view/smarty3/contacts-head.tpl
index 41f8ebddb6..d525e834f9 100644
--- a/view/smarty3/contacts-head.tpl
+++ b/view/smarty3/contacts-head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script src="{{$baseurl}}/library/jquery_ac/friendica.complete.js" ></script>
 
diff --git a/view/smarty3/contacts-template.tpl b/view/smarty3/contacts-template.tpl
index de074fc3c4..66f3f5c87b 100644
--- a/view/smarty3/contacts-template.tpl
+++ b/view/smarty3/contacts-template.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$header}}{{if $total}} ({{$total}}){{/if}}</h1>
 
 {{if $finding}}<h4>{{$finding}}</h4>{{/if}}
@@ -14,8 +19,8 @@
 {{$tabs}}
 
 
-{{foreach $contacts as $c}}
-	{{include file="contact_template.tpl" contact=$c}}
+{{foreach $contacts as $contact}}
+	{{include file="contact_template.tpl"}}
 {{/foreach}}
 <div id="contact-edit-end"></div>
 
diff --git a/view/smarty3/contacts-widget-sidebar.tpl b/view/smarty3/contacts-widget-sidebar.tpl
index d7b9c4b5d5..c4697a91c5 100644
--- a/view/smarty3/contacts-widget-sidebar.tpl
+++ b/view/smarty3/contacts-widget-sidebar.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$vcard_widget}}
 {{$follow_widget}}
 {{$groups_widget}}
diff --git a/view/smarty3/content.tpl b/view/smarty3/content.tpl
index 466045d396..811f92dd56 100644
--- a/view/smarty3/content.tpl
+++ b/view/smarty3/content.tpl
@@ -1,2 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="content-begin"></div>
 <div id="content-end"></div>
diff --git a/view/smarty3/conversation.tpl b/view/smarty3/conversation.tpl
index ce5dc5a2f6..24f0d120d5 100644
--- a/view/smarty3/conversation.tpl
+++ b/view/smarty3/conversation.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$live_update}}
 
 {{foreach $threads as $thread}}
@@ -11,7 +16,7 @@
 		{{/if}}
 		{{if $item.comment_lastcollapsed}}</div>{{/if}}
 		
-		{{include file="file:{{$item.template}}"}}
+		{{include file="{{$item.template}}"}}
 		
 		
 	{{/foreach}}
diff --git a/view/smarty3/crepair.tpl b/view/smarty3/crepair.tpl
index 2a05b96788..8d3ed7df89 100644
--- a/view/smarty3/crepair.tpl
+++ b/view/smarty3/crepair.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <form id="crepair-form" action="crepair/{{$contact_id}}" method="post" >
 
diff --git a/view/smarty3/cropbody.tpl b/view/smarty3/cropbody.tpl
index da5b1e8593..e6fcd355f4 100644
--- a/view/smarty3/cropbody.tpl
+++ b/view/smarty3/cropbody.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$title}}</h1>
 <p id="cropimage-desc">
 {{$desc}}
diff --git a/view/smarty3/cropend.tpl b/view/smarty3/cropend.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/smarty3/cropend.tpl
+++ b/view/smarty3/cropend.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/smarty3/crophead.tpl b/view/smarty3/crophead.tpl
index 48f3754265..d51b87d12f 100644
--- a/view/smarty3/crophead.tpl
+++ b/view/smarty3/crophead.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
       <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
       <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
       <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>
diff --git a/view/smarty3/delegate.tpl b/view/smarty3/delegate.tpl
index cbaa8da860..7aa85cf395 100644
--- a/view/smarty3/delegate.tpl
+++ b/view/smarty3/delegate.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h3>{{$header}}</h3>
 
 <div id="delegate-desc" class="delegate-desc">{{$desc}}</div>
diff --git a/view/smarty3/dfrn_req_confirm.tpl b/view/smarty3/dfrn_req_confirm.tpl
index 655af22d41..c941a201da 100644
--- a/view/smarty3/dfrn_req_confirm.tpl
+++ b/view/smarty3/dfrn_req_confirm.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <p id="dfrn-request-homecoming" >
 {{$welcome}}
diff --git a/view/smarty3/dfrn_request.tpl b/view/smarty3/dfrn_request.tpl
index aa5cbd6e46..29173a1d77 100644
--- a/view/smarty3/dfrn_request.tpl
+++ b/view/smarty3/dfrn_request.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h1>{{$header}}</h1>
 
diff --git a/view/smarty3/diasp_dec_hdr.tpl b/view/smarty3/diasp_dec_hdr.tpl
index 636ff7bd0e..c3305ecd0b 100644
--- a/view/smarty3/diasp_dec_hdr.tpl
+++ b/view/smarty3/diasp_dec_hdr.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <decrypted_hdeader>
   <iv>{{$inner_iv}}</iv>
   <aes_key>{{$inner_key}}</aes_key>
diff --git a/view/smarty3/diaspora_comment.tpl b/view/smarty3/diaspora_comment.tpl
index 27ec3dffce..8df3842d0b 100644
--- a/view/smarty3/diaspora_comment.tpl
+++ b/view/smarty3/diaspora_comment.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <XML>
   <post>
     <comment>
diff --git a/view/smarty3/diaspora_comment_relay.tpl b/view/smarty3/diaspora_comment_relay.tpl
index 37a9e88b3a..c01441e3c1 100644
--- a/view/smarty3/diaspora_comment_relay.tpl
+++ b/view/smarty3/diaspora_comment_relay.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <XML>
   <post>
     <comment>
diff --git a/view/smarty3/diaspora_conversation.tpl b/view/smarty3/diaspora_conversation.tpl
index dc4482e4b0..fd11b826a9 100644
--- a/view/smarty3/diaspora_conversation.tpl
+++ b/view/smarty3/diaspora_conversation.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <XML>
   <post>
     <conversation>
diff --git a/view/smarty3/diaspora_like.tpl b/view/smarty3/diaspora_like.tpl
index b03aef37a1..1d58d5d3f3 100644
--- a/view/smarty3/diaspora_like.tpl
+++ b/view/smarty3/diaspora_like.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <XML>
   <post>
     <like>
diff --git a/view/smarty3/diaspora_like_relay.tpl b/view/smarty3/diaspora_like_relay.tpl
index 30df4cac67..7a55d8b203 100644
--- a/view/smarty3/diaspora_like_relay.tpl
+++ b/view/smarty3/diaspora_like_relay.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <XML>
   <post>
     <like>
diff --git a/view/smarty3/diaspora_message.tpl b/view/smarty3/diaspora_message.tpl
index 3413d79b00..e1690734fd 100644
--- a/view/smarty3/diaspora_message.tpl
+++ b/view/smarty3/diaspora_message.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <XML>
   <post>
       <message>
diff --git a/view/smarty3/diaspora_photo.tpl b/view/smarty3/diaspora_photo.tpl
index cd7ef58023..b6220346c4 100644
--- a/view/smarty3/diaspora_photo.tpl
+++ b/view/smarty3/diaspora_photo.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <XML>
   <post>
     <photo>
diff --git a/view/smarty3/diaspora_post.tpl b/view/smarty3/diaspora_post.tpl
index abbcc4c610..2817f7d4a0 100644
--- a/view/smarty3/diaspora_post.tpl
+++ b/view/smarty3/diaspora_post.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <XML>
   <post>
     <status_message>
diff --git a/view/smarty3/diaspora_profile.tpl b/view/smarty3/diaspora_profile.tpl
index 04f2e2948b..11aaf10550 100644
--- a/view/smarty3/diaspora_profile.tpl
+++ b/view/smarty3/diaspora_profile.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <XML>
  <post><profile>
   <diaspora_handle>{{$handle}}</diaspora_handle>
diff --git a/view/smarty3/diaspora_relay_retraction.tpl b/view/smarty3/diaspora_relay_retraction.tpl
index 5e7aed41f3..97a1344c97 100644
--- a/view/smarty3/diaspora_relay_retraction.tpl
+++ b/view/smarty3/diaspora_relay_retraction.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <XML>
   <post>
     <relayable_retraction>
diff --git a/view/smarty3/diaspora_relayable_retraction.tpl b/view/smarty3/diaspora_relayable_retraction.tpl
index 927e394f39..138cbdb317 100644
--- a/view/smarty3/diaspora_relayable_retraction.tpl
+++ b/view/smarty3/diaspora_relayable_retraction.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <XML>
   <post>
     <relayable_retraction>
diff --git a/view/smarty3/diaspora_retract.tpl b/view/smarty3/diaspora_retract.tpl
index 26e2cb94e3..103bfc9d5c 100644
--- a/view/smarty3/diaspora_retract.tpl
+++ b/view/smarty3/diaspora_retract.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <XML>
   <post>
     <retraction>
diff --git a/view/smarty3/diaspora_share.tpl b/view/smarty3/diaspora_share.tpl
index 59eb061242..5ff04440d5 100644
--- a/view/smarty3/diaspora_share.tpl
+++ b/view/smarty3/diaspora_share.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <XML>
   <post>
     <request>
diff --git a/view/smarty3/diaspora_signed_retract.tpl b/view/smarty3/diaspora_signed_retract.tpl
index f0f346da80..58c5cc2376 100644
--- a/view/smarty3/diaspora_signed_retract.tpl
+++ b/view/smarty3/diaspora_signed_retract.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <XML>
   <post>
     <signed_retraction>
diff --git a/view/smarty3/diaspora_vcard.tpl b/view/smarty3/diaspora_vcard.tpl
index 9d234a3989..5ea6335a87 100644
--- a/view/smarty3/diaspora_vcard.tpl
+++ b/view/smarty3/diaspora_vcard.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div style="display:none;">
 	<dl class='entity_nickname'>
 		<dt>Nickname</dt>
diff --git a/view/smarty3/directory_header.tpl b/view/smarty3/directory_header.tpl
index c2ca64682c..ed1115de9d 100644
--- a/view/smarty3/directory_header.tpl
+++ b/view/smarty3/directory_header.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$sitedir}}</h1>
 
 {{$globaldir}}
diff --git a/view/smarty3/directory_item.tpl b/view/smarty3/directory_item.tpl
index f4bd66d771..ae52646b8f 100644
--- a/view/smarty3/directory_item.tpl
+++ b/view/smarty3/directory_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="directory-item lframe" id="directory-item-{{$id}}" >
 	<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$id}}" > 
diff --git a/view/smarty3/display-head.tpl b/view/smarty3/display-head.tpl
index 3d4e7e96ad..7750b655e0 100644
--- a/view/smarty3/display-head.tpl
+++ b/view/smarty3/display-head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script>
 $(document).ready(function() {
 	$(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
diff --git a/view/smarty3/email_notify_html.tpl b/view/smarty3/email_notify_html.tpl
index 38c933aacb..e7d4afaa52 100644
--- a/view/smarty3/email_notify_html.tpl
+++ b/view/smarty3/email_notify_html.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
diff --git a/view/smarty3/email_notify_text.tpl b/view/smarty3/email_notify_text.tpl
index 3de006095d..e164f3023c 100644
--- a/view/smarty3/email_notify_text.tpl
+++ b/view/smarty3/email_notify_text.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 {{$preamble}}
 	
diff --git a/view/smarty3/end.tpl b/view/smarty3/end.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/smarty3/end.tpl
+++ b/view/smarty3/end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/smarty3/event.tpl b/view/smarty3/event.tpl
index 2a0868d25e..4788dcb380 100644
--- a/view/smarty3/event.tpl
+++ b/view/smarty3/event.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{foreach $events as $event}}
 	<div class="event">
 	
diff --git a/view/smarty3/event_end.tpl b/view/smarty3/event_end.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/smarty3/event_end.tpl
+++ b/view/smarty3/event_end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/smarty3/event_form.tpl b/view/smarty3/event_form.tpl
index 0091b59aaa..335a9480bf 100644
--- a/view/smarty3/event_form.tpl
+++ b/view/smarty3/event_form.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h3>{{$title}}</h3>
 
 <p>
diff --git a/view/smarty3/event_head.tpl b/view/smarty3/event_head.tpl
index 2e2992e078..32288b7ad8 100644
--- a/view/smarty3/event_head.tpl
+++ b/view/smarty3/event_head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <link rel='stylesheet' type='text/css' href='{{$baseurl}}/library/fullcalendar/fullcalendar.css' />
 <script language="javascript" type="text/javascript"
           src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
diff --git a/view/smarty3/events-js.tpl b/view/smarty3/events-js.tpl
index c87d205292..5fa046f5a1 100644
--- a/view/smarty3/events-js.tpl
+++ b/view/smarty3/events-js.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$tabs}}
 <h2>{{$title}}</h2>
 
diff --git a/view/smarty3/events.tpl b/view/smarty3/events.tpl
index 50a8cf3a86..054200ca2d 100644
--- a/view/smarty3/events.tpl
+++ b/view/smarty3/events.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$tabs}}
 <h2>{{$title}}</h2>
 
diff --git a/view/smarty3/events_reminder.tpl b/view/smarty3/events_reminder.tpl
index bd070575fe..3448ea45cb 100644
--- a/view/smarty3/events_reminder.tpl
+++ b/view/smarty3/events_reminder.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $count}}
 <div id="event-notice" class="birthday-notice fakelink {{$classtoday}}" onclick="openClose('event-wrapper');">{{$event_reminders}} ({{$count}})</div>
 <div id="event-wrapper" style="display: none;" ><div id="event-title">{{$event_title}}</div>
diff --git a/view/smarty3/failed_updates.tpl b/view/smarty3/failed_updates.tpl
index 68c0bcdf2a..8161ff2ef4 100644
--- a/view/smarty3/failed_updates.tpl
+++ b/view/smarty3/failed_updates.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h2>{{$banner}}</h2>
 
 <div id="failed_updates_desc">{{$desc}}</div>
diff --git a/view/smarty3/fake_feed.tpl b/view/smarty3/fake_feed.tpl
index c37071cf4a..fd875de716 100644
--- a/view/smarty3/fake_feed.tpl
+++ b/view/smarty3/fake_feed.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?xml version="1.0" encoding="utf-8" ?>
 <feed xmlns="http://www.w3.org/2005/Atom" >
 
diff --git a/view/smarty3/field.tpl b/view/smarty3/field.tpl
index b7111ce5ca..1bf36d84ef 100644
--- a/view/smarty3/field.tpl
+++ b/view/smarty3/field.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
  {{if $field.0==select}}
  {{include file="field_select.tpl"}}
diff --git a/view/smarty3/field_checkbox.tpl b/view/smarty3/field_checkbox.tpl
index 3771fc4a7f..694bce6b57 100644
--- a/view/smarty3/field_checkbox.tpl
+++ b/view/smarty3/field_checkbox.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field checkbox' id='div_id_{{$field.0}}'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/smarty3/field_combobox.tpl b/view/smarty3/field_combobox.tpl
index 3d69e2d272..d3cc75635e 100644
--- a/view/smarty3/field_combobox.tpl
+++ b/view/smarty3/field_combobox.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field combobox'>
 		<label for='id_{{$field.0}}' id='id_{{$field.0}}_label'>{{$field.1}}</label>
diff --git a/view/smarty3/field_custom.tpl b/view/smarty3/field_custom.tpl
index e1bf318dad..c2d73275c3 100644
--- a/view/smarty3/field_custom.tpl
+++ b/view/smarty3/field_custom.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field custom'>
 		<label for='{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/smarty3/field_input.tpl b/view/smarty3/field_input.tpl
index 9f0103f84f..3c400b5ad2 100644
--- a/view/smarty3/field_input.tpl
+++ b/view/smarty3/field_input.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field input'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/smarty3/field_intcheckbox.tpl b/view/smarty3/field_intcheckbox.tpl
index a6ef7cc8fa..54967feab0 100644
--- a/view/smarty3/field_intcheckbox.tpl
+++ b/view/smarty3/field_intcheckbox.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field checkbox'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/smarty3/field_openid.tpl b/view/smarty3/field_openid.tpl
index 53dbfdde03..b00ddabcd8 100644
--- a/view/smarty3/field_openid.tpl
+++ b/view/smarty3/field_openid.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field input openid'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/smarty3/field_password.tpl b/view/smarty3/field_password.tpl
index e840a312d2..5889d2e9c0 100644
--- a/view/smarty3/field_password.tpl
+++ b/view/smarty3/field_password.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field password'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/smarty3/field_radio.tpl b/view/smarty3/field_radio.tpl
index cff8881f50..1d7b56ec6a 100644
--- a/view/smarty3/field_radio.tpl
+++ b/view/smarty3/field_radio.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field radio'>
 		<label for='id_{{$field.0}}_{{$field.2}}'>{{$field.1}}</label>
diff --git a/view/smarty3/field_richtext.tpl b/view/smarty3/field_richtext.tpl
index 6414939898..38992f0f83 100644
--- a/view/smarty3/field_richtext.tpl
+++ b/view/smarty3/field_richtext.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field richtext'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/smarty3/field_select.tpl b/view/smarty3/field_select.tpl
index 18192e1d80..2a4117a70c 100644
--- a/view/smarty3/field_select.tpl
+++ b/view/smarty3/field_select.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field select'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/smarty3/field_select_raw.tpl b/view/smarty3/field_select_raw.tpl
index 4e495dcf83..50e34985f6 100644
--- a/view/smarty3/field_select_raw.tpl
+++ b/view/smarty3/field_select_raw.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field select'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/smarty3/field_textarea.tpl b/view/smarty3/field_textarea.tpl
index 8c311563f2..5d71999d4a 100644
--- a/view/smarty3/field_textarea.tpl
+++ b/view/smarty3/field_textarea.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field textarea'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/smarty3/field_themeselect.tpl b/view/smarty3/field_themeselect.tpl
index 9b6ef23a51..cde744594b 100644
--- a/view/smarty3/field_themeselect.tpl
+++ b/view/smarty3/field_themeselect.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	<script>$(function(){ previewTheme($("#id_{{$field.0}}")[0]); });</script>
 	<div class='field select'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/smarty3/field_yesno.tpl b/view/smarty3/field_yesno.tpl
index e36e775c7a..e982c2f05d 100644
--- a/view/smarty3/field_yesno.tpl
+++ b/view/smarty3/field_yesno.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	<div class='field yesno'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
 		<div class='onoff' id="id_{{$field.0}}_onoff">
diff --git a/view/smarty3/fileas_widget.tpl b/view/smarty3/fileas_widget.tpl
index 70d68c56e4..f03f169a2f 100644
--- a/view/smarty3/fileas_widget.tpl
+++ b/view/smarty3/fileas_widget.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="fileas-sidebar" class="widget">
 	<h3>{{$title}}</h3>
 	<div id="nets-desc">{{$desc}}</div>
diff --git a/view/smarty3/filebrowser.tpl b/view/smarty3/filebrowser.tpl
index 787f7c0cd0..b408ca6874 100644
--- a/view/smarty3/filebrowser.tpl
+++ b/view/smarty3/filebrowser.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE html>
 <html>
 	<head>
diff --git a/view/smarty3/filer_dialog.tpl b/view/smarty3/filer_dialog.tpl
index ae59ab7138..f17a067665 100644
--- a/view/smarty3/filer_dialog.tpl
+++ b/view/smarty3/filer_dialog.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{include file="field_combobox.tpl"}}
 <div class="settings-submit-wrapper" >
 	<input id="filer_save" type="button" class="settings-submit" value="{{$submit}}" />
diff --git a/view/smarty3/follow.tpl b/view/smarty3/follow.tpl
index e0326c51ac..7ea961780f 100644
--- a/view/smarty3/follow.tpl
+++ b/view/smarty3/follow.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="follow-sidebar" class="widget">
 	<h3>{{$connect}}</h3>
 	<div id="connect-desc">{{$desc}}</div>
diff --git a/view/smarty3/follow_slap.tpl b/view/smarty3/follow_slap.tpl
index faa5f4be25..554853f196 100644
--- a/view/smarty3/follow_slap.tpl
+++ b/view/smarty3/follow_slap.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	<entry>
 		<author>
 			<name>{{$name}}</name>
diff --git a/view/smarty3/generic_links_widget.tpl b/view/smarty3/generic_links_widget.tpl
index 8b4c67b6f6..c12273c7be 100644
--- a/view/smarty3/generic_links_widget.tpl
+++ b/view/smarty3/generic_links_widget.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="widget{{if $class}} {{$class}}{{/if}}">
 	{{if $title}}<h3>{{$title}}</h3>{{/if}}
 	{{if $desc}}<div class="desc">{{$desc}}</div>{{/if}}
diff --git a/view/smarty3/group_drop.tpl b/view/smarty3/group_drop.tpl
index 670136db7c..84d380e304 100644
--- a/view/smarty3/group_drop.tpl
+++ b/view/smarty3/group_drop.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="group-delete-wrapper button" id="group-delete-wrapper-{{$id}}" >
 	<a href="group/drop/{{$id}}?t={{$form_security_token}}" 
 		onclick="return confirmDelete();" 
diff --git a/view/smarty3/group_edit.tpl b/view/smarty3/group_edit.tpl
index 424d1c1252..b7b14eba37 100644
--- a/view/smarty3/group_edit.tpl
+++ b/view/smarty3/group_edit.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h2>{{$title}}</h2>
 
 
@@ -15,9 +20,9 @@
 </div>
 
 
-{{if $groupedit_info}}
+{{if $groupeditor}}
 	<div id="group-update-wrapper">
-		{{include file="groupeditor.tpl" groupeditor=$groupedit_info}}
+		{{include file="groupeditor.tpl"}}
 	</div>
 {{/if}}
 {{if $desc}}<div id="group-edit-desc">{{$desc}}</div>{{/if}}
diff --git a/view/smarty3/group_selection.tpl b/view/smarty3/group_selection.tpl
index 2223125ea1..f16bb5159f 100644
--- a/view/smarty3/group_selection.tpl
+++ b/view/smarty3/group_selection.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="field custom">
 <label for="group-selection" id="group-selection-lbl">{{$label}}</label>
 <select name="group-selection" id="group-selection" >
diff --git a/view/smarty3/group_side.tpl b/view/smarty3/group_side.tpl
index ebc8205303..b6532fb6d4 100644
--- a/view/smarty3/group_side.tpl
+++ b/view/smarty3/group_side.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="widget" id="group-sidebar">
 <h3>{{$title}}</h3>
 
diff --git a/view/smarty3/groupeditor.tpl b/view/smarty3/groupeditor.tpl
index c79bb0a2a7..4fad30d5a3 100644
--- a/view/smarty3/groupeditor.tpl
+++ b/view/smarty3/groupeditor.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="group">
 <h3>{{$groupeditor.label_members}}</h3>
 <div id="group-members" class="contact_list">
diff --git a/view/smarty3/head.tpl b/view/smarty3/head.tpl
index 9b7bc915bc..ced248485d 100644
--- a/view/smarty3/head.tpl
+++ b/view/smarty3/head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <base href="{{$baseurl}}/" />
 <meta name="generator" content="{{$generator}}" />
diff --git a/view/smarty3/hide_comments.tpl b/view/smarty3/hide_comments.tpl
index f4ed9c5521..50a3541229 100644
--- a/view/smarty3/hide_comments.tpl
+++ b/view/smarty3/hide_comments.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="hide-comments-outer">
 <span id="hide-comments-total-{{$id}}" class="hide-comments-total">{{$num_comments}}</span> <span id="hide-comments-{{$id}}" class="hide-comments fakelink" onclick="showHideComments({{$id}});">{{$hide_text}}</span>
 </div>
diff --git a/view/smarty3/install.tpl b/view/smarty3/install.tpl
index 81475f587e..cfb90e61fb 100644
--- a/view/smarty3/install.tpl
+++ b/view/smarty3/install.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h1>{{$title}}</h1>
 <h2>{{$pass}}</h2>
diff --git a/view/smarty3/install_checks.tpl b/view/smarty3/install_checks.tpl
index 2a47a6e0bc..44852b4101 100644
--- a/view/smarty3/install_checks.tpl
+++ b/view/smarty3/install_checks.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$title}}</h1>
 <h2>{{$pass}}</h2>
 <form  action="{{$baseurl}}/index.php?q=install" method="post">
diff --git a/view/smarty3/install_db.tpl b/view/smarty3/install_db.tpl
index ef8510ae3b..944666c6a5 100644
--- a/view/smarty3/install_db.tpl
+++ b/view/smarty3/install_db.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h1>{{$title}}</h1>
 <h2>{{$pass}}</h2>
diff --git a/view/smarty3/install_settings.tpl b/view/smarty3/install_settings.tpl
index dcb2f22420..2e97d06969 100644
--- a/view/smarty3/install_settings.tpl
+++ b/view/smarty3/install_settings.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h1>{{$title}}</h1>
 <h2>{{$pass}}</h2>
diff --git a/view/smarty3/intros.tpl b/view/smarty3/intros.tpl
index 6132bfc75b..bafdb07a04 100644
--- a/view/smarty3/intros.tpl
+++ b/view/smarty3/intros.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="intro-wrapper" id="intro-{{$contact_id}}" >
 
diff --git a/view/smarty3/invite.tpl b/view/smarty3/invite.tpl
index 117ee7cd62..a47ee639b2 100644
--- a/view/smarty3/invite.tpl
+++ b/view/smarty3/invite.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <form action="invite" method="post" id="invite-form" >
 <div id="invite-wrapper">
 
diff --git a/view/smarty3/jot-end.tpl b/view/smarty3/jot-end.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/smarty3/jot-end.tpl
+++ b/view/smarty3/jot-end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/smarty3/jot-header.tpl b/view/smarty3/jot-header.tpl
index 493752c7f7..4e7562e95b 100644
--- a/view/smarty3/jot-header.tpl
+++ b/view/smarty3/jot-header.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script language="javascript" type="text/javascript">
 
diff --git a/view/smarty3/jot.tpl b/view/smarty3/jot.tpl
index a25295884d..bd9902159c 100644
--- a/view/smarty3/jot.tpl
+++ b/view/smarty3/jot.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div id="profile-jot-wrapper" >
 	<div id="profile-jot-banner-wrapper">
diff --git a/view/smarty3/jot_geotag.tpl b/view/smarty3/jot_geotag.tpl
index b0f71e73bf..1ed2367aa5 100644
--- a/view/smarty3/jot_geotag.tpl
+++ b/view/smarty3/jot_geotag.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 	if(navigator.geolocation) {
 		navigator.geolocation.getCurrentPosition(function(position) {
diff --git a/view/smarty3/lang_selector.tpl b/view/smarty3/lang_selector.tpl
index 2d0e9cb740..0b4224d7bd 100644
--- a/view/smarty3/lang_selector.tpl
+++ b/view/smarty3/lang_selector.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="lang-select-icon" class="icon s22 language" title="{{$title}}" onclick="openClose('language-selector');" >lang</div>
 <div id="language-selector" style="display: none;" >
 	<form action="#" method="post" >
diff --git a/view/smarty3/like_noshare.tpl b/view/smarty3/like_noshare.tpl
index b01064add7..b8258d64a6 100644
--- a/view/smarty3/like_noshare.tpl
+++ b/view/smarty3/like_noshare.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$id}}">
 	<a href="#" class="icon like" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></a>
 	<a href="#" class="icon dislike" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></a>
diff --git a/view/smarty3/login.tpl b/view/smarty3/login.tpl
index 331caeb246..5d9b5f4f99 100644
--- a/view/smarty3/login.tpl
+++ b/view/smarty3/login.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <form action="{{$dest_url}}" method="post" >
 	<input type="hidden" name="auth-params" value="login" />
diff --git a/view/smarty3/login_head.tpl b/view/smarty3/login_head.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/smarty3/login_head.tpl
+++ b/view/smarty3/login_head.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/smarty3/logout.tpl b/view/smarty3/logout.tpl
index 7548ed1964..582d77ed63 100644
--- a/view/smarty3/logout.tpl
+++ b/view/smarty3/logout.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <form action="{{$dest_url}}" method="post" >
 <div class="logout-wrapper">
 <input type="hidden" name="auth-params" value="logout" />
diff --git a/view/smarty3/lostpass.tpl b/view/smarty3/lostpass.tpl
index f6fdb28d7f..0e437ca484 100644
--- a/view/smarty3/lostpass.tpl
+++ b/view/smarty3/lostpass.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h3>{{$title}}</h3>
 
 <p id="lostpass-desc">
diff --git a/view/smarty3/magicsig.tpl b/view/smarty3/magicsig.tpl
index 78d8bbbd39..af8dbb5bc8 100644
--- a/view/smarty3/magicsig.tpl
+++ b/view/smarty3/magicsig.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?xml version="1.0" encoding="UTF-8"?>
 <me:env xmlns:me="http://salmon-protocol.org/ns/magic-env">
 <me:data type="application/atom+xml">
diff --git a/view/smarty3/mail_conv.tpl b/view/smarty3/mail_conv.tpl
index 1bff551084..5083fdb258 100644
--- a/view/smarty3/mail_conv.tpl
+++ b/view/smarty3/mail_conv.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="mail-conv-outside-wrapper">
 	<div class="mail-conv-sender" >
 		<a href="{{$mail.from_url}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name}}" /></a>
diff --git a/view/smarty3/mail_display.tpl b/view/smarty3/mail_display.tpl
index 49f5ed9611..23d05bdeb8 100644
--- a/view/smarty3/mail_display.tpl
+++ b/view/smarty3/mail_display.tpl
@@ -1,6 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
-{{foreach $mails as $mail_item}}
-	{{include file="mail_conv.tpl" mail=$mail_item}}
+{{foreach $mails as $mail}}
+	{{include file="mail_conv.tpl"}}
 {{/foreach}}
 
 {{if $canreply}}
diff --git a/view/smarty3/mail_head.tpl b/view/smarty3/mail_head.tpl
index 1cd7145e7b..f7a39fa8b1 100644
--- a/view/smarty3/mail_head.tpl
+++ b/view/smarty3/mail_head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h3>{{$messages}}</h3>
 
 {{$tab_content}}
diff --git a/view/smarty3/mail_list.tpl b/view/smarty3/mail_list.tpl
index b08c2ca7a9..9dbfb6a144 100644
--- a/view/smarty3/mail_list.tpl
+++ b/view/smarty3/mail_list.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="mail-list-outside-wrapper">
 	<div class="mail-list-sender" >
 		<a href="{{$from_url}}" class="mail-list-sender-url" ><img class="mail-list-sender-photo{{$sparkle}}" src="{{$from_photo}}" height="80" width="80" alt="{{$from_name}}" /></a>
diff --git a/view/smarty3/maintenance.tpl b/view/smarty3/maintenance.tpl
new file mode 100644
index 0000000000..f0ea0849c2
--- /dev/null
+++ b/view/smarty3/maintenance.tpl
@@ -0,0 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="maintenance-message">{{$sysdown}}</div>
diff --git a/view/smarty3/match.tpl b/view/smarty3/match.tpl
index 0688ca26bd..14b7254669 100644
--- a/view/smarty3/match.tpl
+++ b/view/smarty3/match.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="profile-match-wrapper">
 	<div class="profile-match-photo">
 		<a href="{{$url}}">
diff --git a/view/smarty3/message-end.tpl b/view/smarty3/message-end.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/smarty3/message-end.tpl
+++ b/view/smarty3/message-end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/smarty3/message-head.tpl b/view/smarty3/message-head.tpl
index 84296c3f1e..ffc6affa4d 100644
--- a/view/smarty3/message-head.tpl
+++ b/view/smarty3/message-head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script src="{{$baseurl}}/library/jquery_ac/friendica.complete.js" ></script>
 
 <script>$(document).ready(function() { 
diff --git a/view/smarty3/message_side.tpl b/view/smarty3/message_side.tpl
index ba7e282726..7da22ee3e3 100644
--- a/view/smarty3/message_side.tpl
+++ b/view/smarty3/message_side.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="message-sidebar" class="widget">
 	<div id="message-new"><a href="{{$new.url}}" class="{{if $new.sel}}newmessage-selected{{/if}}">{{$new.label}}</a> </div>
 	
diff --git a/view/smarty3/moderated_comment.tpl b/view/smarty3/moderated_comment.tpl
index 79ce8f99b9..1e4e9b6d4e 100644
--- a/view/smarty3/moderated_comment.tpl
+++ b/view/smarty3/moderated_comment.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
 			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
 				<input type="hidden" name="type" value="{{$type}}" />
diff --git a/view/smarty3/mood_content.tpl b/view/smarty3/mood_content.tpl
index 63eaa2d8db..461303318b 100644
--- a/view/smarty3/mood_content.tpl
+++ b/view/smarty3/mood_content.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h3>{{$title}}</h3>
 
 <div id="mood-desc">{{$desc}}</div>
diff --git a/view/smarty3/msg-end.tpl b/view/smarty3/msg-end.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/smarty3/msg-end.tpl
+++ b/view/smarty3/msg-end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/smarty3/msg-header.tpl b/view/smarty3/msg-header.tpl
index 0d2ca72be8..4c47e1d6d6 100644
--- a/view/smarty3/msg-header.tpl
+++ b/view/smarty3/msg-header.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script language="javascript" type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
 <script language="javascript" type="text/javascript">
diff --git a/view/smarty3/nav.tpl b/view/smarty3/nav.tpl
index 7f7bb6290f..6119a1a93d 100644
--- a/view/smarty3/nav.tpl
+++ b/view/smarty3/nav.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <nav>
 	{{$langselector}}
 
diff --git a/view/smarty3/netfriend.tpl b/view/smarty3/netfriend.tpl
index ec6b3b6cc2..e8658e0bc3 100644
--- a/view/smarty3/netfriend.tpl
+++ b/view/smarty3/netfriend.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="intro-approve-as-friend-desc">{{$approve_as}}</div>
 
 <div class="intro-approve-as-friend-wrapper">
diff --git a/view/smarty3/nets.tpl b/view/smarty3/nets.tpl
index f514626ac7..76b2a57d94 100644
--- a/view/smarty3/nets.tpl
+++ b/view/smarty3/nets.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="nets-sidebar" class="widget">
 	<h3>{{$title}}</h3>
 	<div id="nets-desc">{{$desc}}</div>
diff --git a/view/smarty3/nogroup-template.tpl b/view/smarty3/nogroup-template.tpl
index 16600b9cea..7d103a655b 100644
--- a/view/smarty3/nogroup-template.tpl
+++ b/view/smarty3/nogroup-template.tpl
@@ -1,7 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$header}}</h1>
 
-{{foreach $contacts as $c}}
-	{{include file="contact_template.tpl" contact=$c}}
+{{foreach $contacts as $contact}}
+	{{include file="contact_template.tpl"}}
 {{/foreach}}
 <div id="contact-edit-end"></div>
 
diff --git a/view/smarty3/notifications.tpl b/view/smarty3/notifications.tpl
index 0289c41d40..834a7a016c 100644
--- a/view/smarty3/notifications.tpl
+++ b/view/smarty3/notifications.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h1>{{$notif_header}}</h1>
 
diff --git a/view/smarty3/notifications_comments_item.tpl b/view/smarty3/notifications_comments_item.tpl
index 9c454a3ed5..9913e6cf71 100644
--- a/view/smarty3/notifications_comments_item.tpl
+++ b/view/smarty3/notifications_comments_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="notif-item">
 	<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
 </div>
\ No newline at end of file
diff --git a/view/smarty3/notifications_dislikes_item.tpl b/view/smarty3/notifications_dislikes_item.tpl
index 9c454a3ed5..9913e6cf71 100644
--- a/view/smarty3/notifications_dislikes_item.tpl
+++ b/view/smarty3/notifications_dislikes_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="notif-item">
 	<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
 </div>
\ No newline at end of file
diff --git a/view/smarty3/notifications_friends_item.tpl b/view/smarty3/notifications_friends_item.tpl
index 9c454a3ed5..9913e6cf71 100644
--- a/view/smarty3/notifications_friends_item.tpl
+++ b/view/smarty3/notifications_friends_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="notif-item">
 	<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
 </div>
\ No newline at end of file
diff --git a/view/smarty3/notifications_likes_item.tpl b/view/smarty3/notifications_likes_item.tpl
index ed020a2450..792b285bce 100644
--- a/view/smarty3/notifications_likes_item.tpl
+++ b/view/smarty3/notifications_likes_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="notif-item">
 	<a href="{{$item_link}}" target="friendica-notification"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
 </div>
\ No newline at end of file
diff --git a/view/smarty3/notifications_network_item.tpl b/view/smarty3/notifications_network_item.tpl
index 856955424b..c3381d682f 100644
--- a/view/smarty3/notifications_network_item.tpl
+++ b/view/smarty3/notifications_network_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="notif-item">
 	<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
 </div>
diff --git a/view/smarty3/notifications_posts_item.tpl b/view/smarty3/notifications_posts_item.tpl
index 9c454a3ed5..9913e6cf71 100644
--- a/view/smarty3/notifications_posts_item.tpl
+++ b/view/smarty3/notifications_posts_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="notif-item">
 	<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
 </div>
\ No newline at end of file
diff --git a/view/smarty3/notify.tpl b/view/smarty3/notify.tpl
index 9c454a3ed5..9913e6cf71 100644
--- a/view/smarty3/notify.tpl
+++ b/view/smarty3/notify.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="notif-item">
 	<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
 </div>
\ No newline at end of file
diff --git a/view/smarty3/oauth_authorize.tpl b/view/smarty3/oauth_authorize.tpl
index 2b7afa80e1..d7f1963d24 100644
--- a/view/smarty3/oauth_authorize.tpl
+++ b/view/smarty3/oauth_authorize.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$title}}</h1>
 
 <div class='oauthapp'>
diff --git a/view/smarty3/oauth_authorize_done.tpl b/view/smarty3/oauth_authorize_done.tpl
index 2e91e01252..12d4c6f48f 100644
--- a/view/smarty3/oauth_authorize_done.tpl
+++ b/view/smarty3/oauth_authorize_done.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$title}}</h1>
 
 <p>{{$info}}</p>
diff --git a/view/smarty3/oembed_video.tpl b/view/smarty3/oembed_video.tpl
index 4ad75a82ea..bdfa11509f 100644
--- a/view/smarty3/oembed_video.tpl
+++ b/view/smarty3/oembed_video.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <a href='{{$embedurl}}' onclick='this.innerHTML=Base64.decode("{{$escapedhtml}}"); return false;' style='float:left; margin: 1em; position: relative;'>
 	<img width='{{$tw}}' height='{{$th}}' src='{{$turl}}' >
 	<div style='position: absolute; top: 0px; left: 0px; width: {{$twpx}}; height: {{$thpx}}; background: url({{$baseurl}}/images/icons/48/play.png) no-repeat center center;'></div>
diff --git a/view/smarty3/oexchange_xrd.tpl b/view/smarty3/oexchange_xrd.tpl
index d6bdde7f41..5af7491821 100644
--- a/view/smarty3/oexchange_xrd.tpl
+++ b/view/smarty3/oexchange_xrd.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?xml version='1.0' encoding='UTF-8'?>
 <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
         
diff --git a/view/smarty3/opensearch.tpl b/view/smarty3/opensearch.tpl
index ad45cc9f8f..dc5cf8875b 100644
--- a/view/smarty3/opensearch.tpl
+++ b/view/smarty3/opensearch.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?xml version="1.0" encoding="UTF-8"?>
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
 	<ShortName>Friendica@{{$nodename}}</ShortName>
diff --git a/view/smarty3/pagetypes.tpl b/view/smarty3/pagetypes.tpl
index d5fcd9968f..15cd3047ac 100644
--- a/view/smarty3/pagetypes.tpl
+++ b/view/smarty3/pagetypes.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	{{include file="field_radio.tpl" field=$page_normal}}
 	{{include file="field_radio.tpl" field=$page_community}}
 	{{include file="field_radio.tpl" field=$page_prvgroup}}
diff --git a/view/smarty3/peoplefind.tpl b/view/smarty3/peoplefind.tpl
index 1492db1202..5417ee0edf 100644
--- a/view/smarty3/peoplefind.tpl
+++ b/view/smarty3/peoplefind.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="peoplefind-sidebar" class="widget">
 	<h3>{{$findpeople}}</h3>
 	<div id="peoplefind-desc">{{$desc}}</div>
diff --git a/view/smarty3/photo_album.tpl b/view/smarty3/photo_album.tpl
index 3308bf500a..56ee6b61c6 100644
--- a/view/smarty3/photo_album.tpl
+++ b/view/smarty3/photo_album.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="photo-album-image-wrapper" id="photo-album-image-wrapper-{{$id}}">
 	<a href="{{$photolink}}" class="photo-album-photo-link" id="photo-album-photo-link-{{$id}}" title="{{$phototitle}}">
 		<img src="{{$imgsrc}}" alt="{{$imgalt}}" title="{{$phototitle}}" class="photo-album-photo lframe resize{{$twist}}" id="photo-album-photo-{{$id}}" />
diff --git a/view/smarty3/photo_drop.tpl b/view/smarty3/photo_drop.tpl
index 94ef5a3ee2..ed500fd0ad 100644
--- a/view/smarty3/photo_drop.tpl
+++ b/view/smarty3/photo_drop.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$id}}" >
 	<a href="item/drop/{{$id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
 </div>
diff --git a/view/smarty3/photo_edit.tpl b/view/smarty3/photo_edit.tpl
index 4c7eed833b..fefe7f10b5 100644
--- a/view/smarty3/photo_edit.tpl
+++ b/view/smarty3/photo_edit.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <form action="photos/{{$nickname}}/{{$resource_id}}" method="post" id="photo_edit_form" >
 
diff --git a/view/smarty3/photo_edit_head.tpl b/view/smarty3/photo_edit_head.tpl
index f72dd2ed0d..50e6802957 100644
--- a/view/smarty3/photo_edit_head.tpl
+++ b/view/smarty3/photo_edit_head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script>
 
diff --git a/view/smarty3/photo_item.tpl b/view/smarty3/photo_item.tpl
index e7d25fd558..7d6ac96ee1 100644
--- a/view/smarty3/photo_item.tpl
+++ b/view/smarty3/photo_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="wall-item-outside-wrapper{{$indent}}" id="wall-item-outside-wrapper-{{$id}}" >
 	<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$id}}" >
 		<a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-photo-link" id="wall-item-photo-link-{{$id}}">
diff --git a/view/smarty3/photo_top.tpl b/view/smarty3/photo_top.tpl
index 826266affe..b34e1e6394 100644
--- a/view/smarty3/photo_top.tpl
+++ b/view/smarty3/photo_top.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="photo-top-image-wrapper lframe" id="photo-top-image-wrapper-{{$photo.id}}">
 	<a href="{{$photo.link}}" class="photo-top-photo-link" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title}}">
diff --git a/view/smarty3/photo_view.tpl b/view/smarty3/photo_view.tpl
index 5431301132..94f71bdd89 100644
--- a/view/smarty3/photo_view.tpl
+++ b/view/smarty3/photo_view.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="live-display"></div>
 <h3><a href="{{$album.0}}">{{$album.1}}</a></h3>
 
diff --git a/view/smarty3/photos_head.tpl b/view/smarty3/photos_head.tpl
index eb04a0791d..b90fc92bbb 100644
--- a/view/smarty3/photos_head.tpl
+++ b/view/smarty3/photos_head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script>
 
diff --git a/view/smarty3/photos_recent.tpl b/view/smarty3/photos_recent.tpl
index 3295625159..cb2411df34 100644
--- a/view/smarty3/photos_recent.tpl
+++ b/view/smarty3/photos_recent.tpl
@@ -1,11 +1,16 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h3>{{$title}}</h3>
 {{if $can_post}}
 <a id="photo-top-upload-link" href="{{$upload.1}}">{{$upload.0}}</a>
 {{/if}}
 
 <div class="photos">
-{{foreach $photos as $ph}}
-	{{include file="photo_top.tpl" photo=$ph}}
+{{foreach $photos as $photo}}
+	{{include file="photo_top.tpl"}}
 {{/foreach}}
 </div>
 <div class="photos-end"></div>
diff --git a/view/smarty3/photos_upload.tpl b/view/smarty3/photos_upload.tpl
index 5045a95899..052ed059a1 100644
--- a/view/smarty3/photos_upload.tpl
+++ b/view/smarty3/photos_upload.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h3>{{$pagename}}</h3>
 
 <div id="photos-usage-message">{{$usage}}</div>
diff --git a/view/smarty3/poco_entry_xml.tpl b/view/smarty3/poco_entry_xml.tpl
index 8698948524..d6e139cb59 100644
--- a/view/smarty3/poco_entry_xml.tpl
+++ b/view/smarty3/poco_entry_xml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <entry>
 {{if $entry.id}}<id>{{$entry.id}}</id>{{/if}}
 {{if $entry.displayName}}<displayName>{{$entry.displayName}}</displayName>{{/if}}
diff --git a/view/smarty3/poco_xml.tpl b/view/smarty3/poco_xml.tpl
index cd54b5446c..b8cd8fc081 100644
--- a/view/smarty3/poco_xml.tpl
+++ b/view/smarty3/poco_xml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?xml version="1.0" encoding="utf-8"?>
 <response>
 {{if $response.sorted}}<sorted>{{$response.sorted}}</sorted>{{/if}}
@@ -9,8 +14,8 @@
 
 
 {{if $response.totalResults}}
-{{foreach $response.entry as $ent}}
-{{include file="poco_entry_xml.tpl" entry=$ent}}
+{{foreach $response.entry as $entry}}
+{{include file="poco_entry_xml.tpl"}}
 {{/foreach}}
 {{else}}
 <entry></entry>
diff --git a/view/smarty3/poke_content.tpl b/view/smarty3/poke_content.tpl
index 22a0b291ff..6235aca0c0 100644
--- a/view/smarty3/poke_content.tpl
+++ b/view/smarty3/poke_content.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h3>{{$title}}</h3>
 
 <div id="poke-desc">{{$desc}}</div>
diff --git a/view/smarty3/posted_date_widget.tpl b/view/smarty3/posted_date_widget.tpl
index 009fa60a65..2f5838edb8 100644
--- a/view/smarty3/posted_date_widget.tpl
+++ b/view/smarty3/posted_date_widget.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="datebrowse-sidebar" class="widget">
 	<h3>{{$title}}</h3>
 <script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script>
diff --git a/view/smarty3/profed_end.tpl b/view/smarty3/profed_end.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/smarty3/profed_end.tpl
+++ b/view/smarty3/profed_end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/smarty3/profed_head.tpl b/view/smarty3/profed_head.tpl
index d2101c3242..83b7ddfe9f 100644
--- a/view/smarty3/profed_head.tpl
+++ b/view/smarty3/profed_head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script type="text/javascript" src="js/country.js" ></script>
 
 <script language="javascript" type="text/javascript"
diff --git a/view/smarty3/profile-hide-friends.tpl b/view/smarty3/profile-hide-friends.tpl
index 590730a7c8..6e3d395d07 100644
--- a/view/smarty3/profile-hide-friends.tpl
+++ b/view/smarty3/profile-hide-friends.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <p id="hide-friends-text">
 {{$desc}}
 </p>
diff --git a/view/smarty3/profile-hide-wall.tpl b/view/smarty3/profile-hide-wall.tpl
index 6a118982ec..755908d176 100644
--- a/view/smarty3/profile-hide-wall.tpl
+++ b/view/smarty3/profile-hide-wall.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <p id="hide-wall-text">
 {{$desc}}
 </p>
diff --git a/view/smarty3/profile-in-directory.tpl b/view/smarty3/profile-in-directory.tpl
index b36739514f..0efd1bf5c0 100644
--- a/view/smarty3/profile-in-directory.tpl
+++ b/view/smarty3/profile-in-directory.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <p id="profile-in-directory">
 {{$desc}}
 </p>
diff --git a/view/smarty3/profile-in-netdir.tpl b/view/smarty3/profile-in-netdir.tpl
index 23d4642ac8..b9cb456ea5 100644
--- a/view/smarty3/profile-in-netdir.tpl
+++ b/view/smarty3/profile-in-netdir.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <p id="profile-in-directory">
 {{$desc}}
 </p>
diff --git a/view/smarty3/profile_advanced.tpl b/view/smarty3/profile_advanced.tpl
index 812132f0c3..b9cc57931b 100644
--- a/view/smarty3/profile_advanced.tpl
+++ b/view/smarty3/profile_advanced.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h2>{{$title}}</h2>
 
 <dl id="aprofile-fullname" class="aprofile">
diff --git a/view/smarty3/profile_edit.tpl b/view/smarty3/profile_edit.tpl
index c595e88540..4b7c4d0b1c 100644
--- a/view/smarty3/profile_edit.tpl
+++ b/view/smarty3/profile_edit.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$default}}
 
 <h1>{{$banner}}</h1>
diff --git a/view/smarty3/profile_edlink.tpl b/view/smarty3/profile_edlink.tpl
index 2f4600a87e..9424bcc3dc 100644
--- a/view/smarty3/profile_edlink.tpl
+++ b/view/smarty3/profile_edlink.tpl
@@ -1,2 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="{{$editprofile}}" href="profiles/{{$profid}}" ></a></div>
 <div class="clear"></div>
\ No newline at end of file
diff --git a/view/smarty3/profile_entry.tpl b/view/smarty3/profile_entry.tpl
index e06307c8bb..4774fd11b3 100644
--- a/view/smarty3/profile_entry.tpl
+++ b/view/smarty3/profile_entry.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="profile-listing" >
 <div class="profile-listing-photo-wrapper" >
diff --git a/view/smarty3/profile_listing_header.tpl b/view/smarty3/profile_listing_header.tpl
index b771a1ea2a..f77bdcc807 100644
--- a/view/smarty3/profile_listing_header.tpl
+++ b/view/smarty3/profile_listing_header.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$header}}</h1>
 <p id="profile-listing-desc" class="button" >
 <a href="profile_photo" >{{$chg_photo}}</a>
diff --git a/view/smarty3/profile_photo.tpl b/view/smarty3/profile_photo.tpl
index d73779e20a..8a278cdfe9 100644
--- a/view/smarty3/profile_photo.tpl
+++ b/view/smarty3/profile_photo.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$title}}</h1>
 
 <form enctype="multipart/form-data" action="profile_photo" method="post">
diff --git a/view/smarty3/profile_publish.tpl b/view/smarty3/profile_publish.tpl
index 265c0c63ca..1dc9eb7fc6 100644
--- a/view/smarty3/profile_publish.tpl
+++ b/view/smarty3/profile_publish.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <p id="profile-publish-desc-{{$instance}}">
 {{$pubdesc}}
 </p>
diff --git a/view/smarty3/profile_vcard.tpl b/view/smarty3/profile_vcard.tpl
index 4e3b1f366e..3f4d3c711c 100644
--- a/view/smarty3/profile_vcard.tpl
+++ b/view/smarty3/profile_vcard.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="vcard">
 
 	<div class="fn label">{{$profile.name}}</div>
diff --git a/view/smarty3/prv_message.tpl b/view/smarty3/prv_message.tpl
index 66007f803f..83cf7e99c4 100644
--- a/view/smarty3/prv_message.tpl
+++ b/view/smarty3/prv_message.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h3>{{$header}}</h3>
 
diff --git a/view/smarty3/pwdreset.tpl b/view/smarty3/pwdreset.tpl
index 3993dec64f..e86e1227f8 100644
--- a/view/smarty3/pwdreset.tpl
+++ b/view/smarty3/pwdreset.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h3>{{$lbl1}}</h3>
 
 <p>
diff --git a/view/smarty3/register.tpl b/view/smarty3/register.tpl
index bdec2ffb4f..5e655cd82e 100644
--- a/view/smarty3/register.tpl
+++ b/view/smarty3/register.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h3>{{$regtitle}}</h3>
 
 <form action="register" method="post" id="register-form">
@@ -11,10 +16,12 @@
 	<p id="register-fill-desc">{{$fillwith}}</p>
 	<p id="register-fill-ext">{{$fillext}}</p>
 
+{{if $oidlabel}}
 	<div id="register-openid-wrapper" >
-			{{$oidhtml}}
+    	<label for="register-openid" id="label-register-openid" >{{$oidlabel}}</label><input 	type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="{{$openid}}" >
 	</div>
 	<div id="register-openid-end" ></div>
+{{/if}}
 
 {{if $invitations}}
 
diff --git a/view/smarty3/remote_friends_common.tpl b/view/smarty3/remote_friends_common.tpl
index b68e1c3470..5844aac87e 100644
--- a/view/smarty3/remote_friends_common.tpl
+++ b/view/smarty3/remote_friends_common.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="remote-friends-in-common" class="bigwidget">
 	<div id="rfic-desc">{{$desc}} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{if $linkmore}}<a href="{{$base}}/common/rem/{{$uid}}/{{$cid}}">{{$more}}</a>{{/if}}</div>
 	{{if $items}}
diff --git a/view/smarty3/removeme.tpl b/view/smarty3/removeme.tpl
index 496f91ff50..3fe12a2231 100644
--- a/view/smarty3/removeme.tpl
+++ b/view/smarty3/removeme.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$title}}</h1>
 
 <div id="remove-account-wrapper">
diff --git a/view/smarty3/saved_searches_aside.tpl b/view/smarty3/saved_searches_aside.tpl
index 023b974f6f..0685eda7ed 100644
--- a/view/smarty3/saved_searches_aside.tpl
+++ b/view/smarty3/saved_searches_aside.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="widget" id="saved-search-list">
 	<h3 id="search">{{$title}}</h3>
 	{{$searchbox}}
diff --git a/view/smarty3/search_item.tpl b/view/smarty3/search_item.tpl
index 8b19b11491..c6b9cc7dc5 100644
--- a/view/smarty3/search_item.tpl
+++ b/view/smarty3/search_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <a name="{{$item.id}}" ></a>
 <div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
 	<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" >
diff --git a/view/smarty3/settings-end.tpl b/view/smarty3/settings-end.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/smarty3/settings-end.tpl
+++ b/view/smarty3/settings-end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/smarty3/settings-head.tpl b/view/smarty3/settings-head.tpl
index b40e36a1f8..2182408392 100644
--- a/view/smarty3/settings-head.tpl
+++ b/view/smarty3/settings-head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script>
 	var ispublic = "{{$ispublic}}";
diff --git a/view/smarty3/settings.tpl b/view/smarty3/settings.tpl
index 9fdd5437b0..b79b26b795 100644
--- a/view/smarty3/settings.tpl
+++ b/view/smarty3/settings.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$ptitle}}</h1>
 
 {{$nickname_block}}
diff --git a/view/smarty3/settings_addons.tpl b/view/smarty3/settings_addons.tpl
index afddafb36c..52b71f1dbd 100644
--- a/view/smarty3/settings_addons.tpl
+++ b/view/smarty3/settings_addons.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$title}}</h1>
 
 
diff --git a/view/smarty3/settings_connectors.tpl b/view/smarty3/settings_connectors.tpl
index 4d33393b13..0b0d78299b 100644
--- a/view/smarty3/settings_connectors.tpl
+++ b/view/smarty3/settings_connectors.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$title}}</h1>
 
 <div class="connector_statusmsg">{{$diasp_enabled}}</div>
diff --git a/view/smarty3/settings_display.tpl b/view/smarty3/settings_display.tpl
index f8b4c51306..a8826aada1 100644
--- a/view/smarty3/settings_display.tpl
+++ b/view/smarty3/settings_display.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$ptitle}}</h1>
 
 <form action="settings/display" id="settings-form" method="post" autocomplete="off" >
diff --git a/view/smarty3/settings_display_end.tpl b/view/smarty3/settings_display_end.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/smarty3/settings_display_end.tpl
+++ b/view/smarty3/settings_display_end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/smarty3/settings_features.tpl b/view/smarty3/settings_features.tpl
index 5c0333df26..f5c5c50963 100644
--- a/view/smarty3/settings_features.tpl
+++ b/view/smarty3/settings_features.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$title}}</h1>
 
 
diff --git a/view/smarty3/settings_nick_set.tpl b/view/smarty3/settings_nick_set.tpl
index 85956d97c0..fb886695ea 100644
--- a/view/smarty3/settings_nick_set.tpl
+++ b/view/smarty3/settings_nick_set.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div id="settings-nick-wrapper" >
 <div id="settings-nickname-desc" class="info-message">{{$desc}} <strong>'{{$nickname}}@{{$basepath}}'</strong>{{$subdir}}</div>
diff --git a/view/smarty3/settings_nick_subdir.tpl b/view/smarty3/settings_nick_subdir.tpl
index a271e0f052..874185db5c 100644
--- a/view/smarty3/settings_nick_subdir.tpl
+++ b/view/smarty3/settings_nick_subdir.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <p>
 It appears that your website is located in a subdirectory of the<br />
 {{$hostname}} website, so this setting may not work reliably.<br />
diff --git a/view/smarty3/settings_oauth.tpl b/view/smarty3/settings_oauth.tpl
index 11c61a43e0..feab78210b 100644
--- a/view/smarty3/settings_oauth.tpl
+++ b/view/smarty3/settings_oauth.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$title}}</h1>
 
 
diff --git a/view/smarty3/settings_oauth_edit.tpl b/view/smarty3/settings_oauth_edit.tpl
index bf805363c5..e3960bf75f 100644
--- a/view/smarty3/settings_oauth_edit.tpl
+++ b/view/smarty3/settings_oauth_edit.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$title}}</h1>
 
 <form method="POST">
diff --git a/view/smarty3/suggest_friends.tpl b/view/smarty3/suggest_friends.tpl
index c8b9dd28da..060db00050 100644
--- a/view/smarty3/suggest_friends.tpl
+++ b/view/smarty3/suggest_friends.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="profile-match-wrapper">
 	<a href="{{$ignlnk}}" title="{{$ignore}}" class="icon drophide profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" ></a>
 	<div class="profile-match-photo">
diff --git a/view/smarty3/suggestions.tpl b/view/smarty3/suggestions.tpl
index 02460b6ad9..b4f0cbbe52 100644
--- a/view/smarty3/suggestions.tpl
+++ b/view/smarty3/suggestions.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="intro-wrapper" >
 
diff --git a/view/smarty3/tag_slap.tpl b/view/smarty3/tag_slap.tpl
index bb991e6b1c..6d1bd01d61 100644
--- a/view/smarty3/tag_slap.tpl
+++ b/view/smarty3/tag_slap.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	<entry>
 		<author>
 			<name>{{$name}}</name>
diff --git a/view/smarty3/threaded_conversation.tpl b/view/smarty3/threaded_conversation.tpl
index 0830063c61..bcdcf6e7be 100644
--- a/view/smarty3/threaded_conversation.tpl
+++ b/view/smarty3/threaded_conversation.tpl
@@ -1,7 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$live_update}}
 
 {{foreach $threads as $thread}}
-{{include file="file:{{$thread.template}}" item=$thread}}
+{{include file="{{$thread.template}}" item=$thread}}
 {{/foreach}}
 
 <div id="conversation-end"></div>
diff --git a/view/smarty3/toggle_mobile_footer.tpl b/view/smarty3/toggle_mobile_footer.tpl
index 82c0197bae..008d69663b 100644
--- a/view/smarty3/toggle_mobile_footer.tpl
+++ b/view/smarty3/toggle_mobile_footer.tpl
@@ -1,2 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <a id="toggle_mobile_link" href="{{$toggle_link}}">{{$toggle_text}}</a>
 
diff --git a/view/smarty3/uexport.tpl b/view/smarty3/uexport.tpl
index efdcd6d1c0..1d9362d724 100644
--- a/view/smarty3/uexport.tpl
+++ b/view/smarty3/uexport.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h3>{{$title}}</h3>
 
 
diff --git a/view/smarty3/uimport.tpl b/view/smarty3/uimport.tpl
index cb0290ed47..cc137514a7 100644
--- a/view/smarty3/uimport.tpl
+++ b/view/smarty3/uimport.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <form action="uimport" method="post" id="uimport-form" enctype="multipart/form-data">
 <h1>{{$import.title}}</h1>
     <p>{{$import.intro}}</p>
diff --git a/view/smarty3/vcard-widget.tpl b/view/smarty3/vcard-widget.tpl
index 1a4f90c4ea..6ccd2ae1d0 100644
--- a/view/smarty3/vcard-widget.tpl
+++ b/view/smarty3/vcard-widget.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	<div class="vcard">
 		<div class="fn">{{$name}}</div>
 		<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="{{$photo}}" alt="{{$name}}" /></div>
diff --git a/view/smarty3/viewcontact_template.tpl b/view/smarty3/viewcontact_template.tpl
index 19a4eec805..a9837c7f9b 100644
--- a/view/smarty3/viewcontact_template.tpl
+++ b/view/smarty3/viewcontact_template.tpl
@@ -1,7 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h3>{{$title}}</h3>
 
-{{foreach $contacts as $c}}
-	{{include file="contact_template.tpl" contact=$c}}
+{{foreach $contacts as $contact}}
+	{{include file="contact_template.tpl"}}
 {{/foreach}}
 
 <div id="view-contact-end"></div>
diff --git a/view/smarty3/voting_fakelink.tpl b/view/smarty3/voting_fakelink.tpl
index ddba96b26a..3d14ba48bb 100644
--- a/view/smarty3/voting_fakelink.tpl
+++ b/view/smarty3/voting_fakelink.tpl
@@ -1,2 +1,6 @@
-		<span class="fakelink" onclick="openClose('{{$vote_id}}');">{{$count}} {{$people}}</span> {{$vote_mood}}<br />
-
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$phrase}}
diff --git a/view/smarty3/wall_thread.tpl b/view/smarty3/wall_thread.tpl
index c1fed91bab..c0e30c4cbf 100644
--- a/view/smarty3/wall_thread.tpl
+++ b/view/smarty3/wall_thread.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $item.comment_firstcollapsed}}
 	<div class="hide-comments-outer">
 	<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
@@ -108,7 +113,7 @@
 <div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
 </div>
 {{foreach $item.children as $child}}
-	{{include file="file:{{$child.template}}" item=$child}}
+	{{include file="{{$child.template}}" item=$child}}
 {{/foreach}}
 
 {{if $item.flatten}}
diff --git a/view/smarty3/wallmessage.tpl b/view/smarty3/wallmessage.tpl
index bea386b95b..6eeabe9ed4 100644
--- a/view/smarty3/wallmessage.tpl
+++ b/view/smarty3/wallmessage.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h3>{{$header}}</h3>
 
diff --git a/view/smarty3/wallmsg-end.tpl b/view/smarty3/wallmsg-end.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/smarty3/wallmsg-end.tpl
+++ b/view/smarty3/wallmsg-end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/smarty3/wallmsg-header.tpl b/view/smarty3/wallmsg-header.tpl
index 09f5b30a7f..1f5a1abc1f 100644
--- a/view/smarty3/wallmsg-header.tpl
+++ b/view/smarty3/wallmsg-header.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script language="javascript" type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
 <script language="javascript" type="text/javascript">
diff --git a/view/smarty3/xrd_diaspora.tpl b/view/smarty3/xrd_diaspora.tpl
index aa0d8c740d..143980bcc6 100644
--- a/view/smarty3/xrd_diaspora.tpl
+++ b/view/smarty3/xrd_diaspora.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	<Link rel="http://joindiaspora.com/seed_location" type="text/html" href="{{$baseurl}}/" />
 	<Link rel="http://joindiaspora.com/guid" type="text/html" href="{{$dspr_guid}}" />
 	<Link rel="diaspora-public-key" type="RSA" href="{{$dspr_key}}" />
diff --git a/view/smarty3/xrd_host.tpl b/view/smarty3/xrd_host.tpl
index 4bcc5bbdb4..1f273e010a 100644
--- a/view/smarty3/xrd_host.tpl
+++ b/view/smarty3/xrd_host.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?xml version='1.0' encoding='UTF-8'?>
 <XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'
      xmlns:hm='http://host-meta.net/xrd/1.0'>
diff --git a/view/smarty3/xrd_person.tpl b/view/smarty3/xrd_person.tpl
index a9d075a51f..3f12eff515 100644
--- a/view/smarty3/xrd_person.tpl
+++ b/view/smarty3/xrd_person.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?xml version="1.0" encoding="UTF-8"?>
 <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
  
diff --git a/view/sv/smarty3/cmnt_received_eml.tpl b/view/sv/smarty3/cmnt_received_eml.tpl
index 937a7d413c..b001b8e49c 100644
--- a/view/sv/smarty3/cmnt_received_eml.tpl
+++ b/view/sv/smarty3/cmnt_received_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 {{$username}},
 
diff --git a/view/sv/smarty3/follow_notify_eml.tpl b/view/sv/smarty3/follow_notify_eml.tpl
index 1ef5334472..1c56dd55a1 100644
--- a/view/sv/smarty3/follow_notify_eml.tpl
+++ b/view/sv/smarty3/follow_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$myname}},
 
 '{{$requestor}}' på {{$sitename}} vill följa dina uppdateringar här på Friendica.
diff --git a/view/sv/smarty3/friend_complete_eml.tpl b/view/sv/smarty3/friend_complete_eml.tpl
index cc20902a47..18b063c15d 100644
--- a/view/sv/smarty3/friend_complete_eml.tpl
+++ b/view/sv/smarty3/friend_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$username}},
 
 Goda nyheter... '{{$fn}}' på '{{$dfrn_url}}' har accepterat din kontaktförfrågan på '{{$sitename}}'.
diff --git a/view/sv/smarty3/htconfig.tpl b/view/sv/smarty3/htconfig.tpl
index 75d6a77e89..033e481940 100644
--- a/view/sv/smarty3/htconfig.tpl
+++ b/view/sv/smarty3/htconfig.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?php
 
 // Set the following for your MySQL installation
diff --git a/view/sv/smarty3/intro_complete_eml.tpl b/view/sv/smarty3/intro_complete_eml.tpl
index b9dac4fc0b..49b18846b8 100644
--- a/view/sv/smarty3/intro_complete_eml.tpl
+++ b/view/sv/smarty3/intro_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$username}},
 
 '{{$fn}}' på '{{$dfrn_url}}' har accepterat din kontaktförfrågan på '{{$sitename}}'.
diff --git a/view/sv/smarty3/lostpass_eml.tpl b/view/sv/smarty3/lostpass_eml.tpl
index 11f1bb2940..1941b44796 100644
--- a/view/sv/smarty3/lostpass_eml.tpl
+++ b/view/sv/smarty3/lostpass_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$username}},
 
 En begäran om återställning av lösenord på {{$sitename}} har mottagits. 
diff --git a/view/sv/smarty3/mail_received_html_body_eml.tpl b/view/sv/smarty3/mail_received_html_body_eml.tpl
index 8914073c24..c3d4168803 100644
--- a/view/sv/smarty3/mail_received_html_body_eml.tpl
+++ b/view/sv/smarty3/mail_received_html_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
diff --git a/view/sv/smarty3/mail_received_text_body_eml.tpl b/view/sv/smarty3/mail_received_text_body_eml.tpl
index b829e80216..ce33407851 100644
--- a/view/sv/smarty3/mail_received_text_body_eml.tpl
+++ b/view/sv/smarty3/mail_received_text_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$from}} har skickat ett personligt meddelande till dig på {{$siteName}}.
 	
 {{$title}}
diff --git a/view/sv/smarty3/passchanged_eml.tpl b/view/sv/smarty3/passchanged_eml.tpl
index 821344f2bb..49afb735f2 100644
--- a/view/sv/smarty3/passchanged_eml.tpl
+++ b/view/sv/smarty3/passchanged_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 {{$username}},
 
diff --git a/view/sv/smarty3/register_open_eml.tpl b/view/sv/smarty3/register_open_eml.tpl
index 101fe62739..55bd64e3dd 100644
--- a/view/sv/smarty3/register_open_eml.tpl
+++ b/view/sv/smarty3/register_open_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$username}},
 Tack för att du registrerat dig på {{$sitename}}. Kontot har skapats. 
 Här är dina inloggningsuppgifter:
diff --git a/view/sv/smarty3/register_verify_eml.tpl b/view/sv/smarty3/register_verify_eml.tpl
index 051c3887c2..50c94f94a8 100644
--- a/view/sv/smarty3/register_verify_eml.tpl
+++ b/view/sv/smarty3/register_verify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 En registreringsförfrågan som kräver svar har mottagits 
 på {{$sitename}} 
 
diff --git a/view/sv/smarty3/request_notify_eml.tpl b/view/sv/smarty3/request_notify_eml.tpl
index 3caa620645..22cfb46deb 100644
--- a/view/sv/smarty3/request_notify_eml.tpl
+++ b/view/sv/smarty3/request_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$myname}},
 
 Du har just fått en kontaktförfrågan på {{$sitename}} från '{{$requestor}}'
diff --git a/view/sv/smarty3/wall_received_eml.tpl b/view/sv/smarty3/wall_received_eml.tpl
index d184b6b895..cd286ecf2f 100644
--- a/view/sv/smarty3/wall_received_eml.tpl
+++ b/view/sv/smarty3/wall_received_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$username}},
 
 '{{$from}}' har skrivit på din profilsida.
diff --git a/view/theme/cleanzero/smarty3/nav.tpl b/view/theme/cleanzero/smarty3/nav.tpl
index 8146ca952f..437c7e5959 100644
--- a/view/theme/cleanzero/smarty3/nav.tpl
+++ b/view/theme/cleanzero/smarty3/nav.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
  <nav>
 	{{$langselector}}
 
diff --git a/view/theme/cleanzero/smarty3/theme_settings.tpl b/view/theme/cleanzero/smarty3/theme_settings.tpl
index dabda90fd9..0743b25947 100644
--- a/view/theme/cleanzero/smarty3/theme_settings.tpl
+++ b/view/theme/cleanzero/smarty3/theme_settings.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{include file="field_select.tpl" field=$color}}
 {{include file="field_select.tpl" field=$font_size}}
 {{include file="field_select.tpl" field=$resize}}
diff --git a/view/theme/cleanzero/theme.php b/view/theme/cleanzero/theme.php
index 356a1b71cb..37ba15ce0a 100644
--- a/view/theme/cleanzero/theme.php
+++ b/view/theme/cleanzero/theme.php
@@ -5,12 +5,13 @@
  * Version:
  * Author: Christian Vogeley (https://christian-vogeley.de/profile/christian)
  */
+
+function cleanzero_init(&$a) {
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
 set_template_engine($a, 'smarty3');
 
-function cleanzero_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
 
diff --git a/view/theme/comix-plain/smarty3/comment_item.tpl b/view/theme/comix-plain/smarty3/comment_item.tpl
index c91da3f1f8..21b7d03563 100644
--- a/view/theme/comix-plain/smarty3/comment_item.tpl
+++ b/view/theme/comix-plain/smarty3/comment_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
 			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
 				<input type="hidden" name="type" value="{{$type}}" />
diff --git a/view/theme/comix-plain/smarty3/search_item.tpl b/view/theme/comix-plain/smarty3/search_item.tpl
index 676cd44757..e07731246c 100644
--- a/view/theme/comix-plain/smarty3/search_item.tpl
+++ b/view/theme/comix-plain/smarty3/search_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
 	<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" >
 		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
diff --git a/view/theme/comix-plain/theme.php b/view/theme/comix-plain/theme.php
index 4e5fd0d0e9..f4781b08f0 100644
--- a/view/theme/comix-plain/theme.php
+++ b/view/theme/comix-plain/theme.php
@@ -8,6 +8,7 @@
  */
 
 
+function comix_plain_init(&$a) {
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
@@ -59,3 +60,5 @@ $('.savedsearchterm').hover(
 
 </script>
 EOT;
+}
+
diff --git a/view/theme/comix/smarty3/comment_item.tpl b/view/theme/comix/smarty3/comment_item.tpl
index c91da3f1f8..21b7d03563 100644
--- a/view/theme/comix/smarty3/comment_item.tpl
+++ b/view/theme/comix/smarty3/comment_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
 			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
 				<input type="hidden" name="type" value="{{$type}}" />
diff --git a/view/theme/comix/smarty3/search_item.tpl b/view/theme/comix/smarty3/search_item.tpl
index c43b8f2f29..a52d93f5cd 100644
--- a/view/theme/comix/smarty3/search_item.tpl
+++ b/view/theme/comix/smarty3/search_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="wall-item-outside-wrapper {{$item.indent}} {{$item.shiny}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
 	<div class="wall-item-content-wrapper {{$item.indent}} {{$item.shiny}}" id="wall-item-content-wrapper-{{$item.id}}" >
 		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
diff --git a/view/theme/comix/theme.php b/view/theme/comix/theme.php
index ce28ebf189..da195f267a 100644
--- a/view/theme/comix/theme.php
+++ b/view/theme/comix/theme.php
@@ -8,6 +8,7 @@
  */
 
 
+function comix_init(&$a) {
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
@@ -59,3 +60,5 @@ $('.savedsearchterm').hover(
 
 </script>
 EOT;
+}
+
diff --git a/view/theme/darkbubble/theme.php b/view/theme/darkbubble/theme.php
index ecd14da772..475d4e63ce 100644
--- a/view/theme/darkbubble/theme.php
+++ b/view/theme/darkbubble/theme.php
@@ -7,6 +7,7 @@
  */
 
 
+function darkbubble_init(&$a) {
 $a->theme_info = array(
   'extends' => 'testbubble',
 );
@@ -21,3 +22,4 @@ $('html').click(function() { $("#nav-notifications-menu" ).hide(); });
 });
 </script>
 EOT;
+}
diff --git a/view/theme/darkzero-NS/theme.php b/view/theme/darkzero-NS/theme.php
index 211c552c51..ee227109b1 100644
--- a/view/theme/darkzero-NS/theme.php
+++ b/view/theme/darkzero-NS/theme.php
@@ -7,11 +7,11 @@
  * Author: Mike Macgirvin <mike@macgirvin.com>
  */
 
+function darkzero_NS_init(&$a) {
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
 
-function darkzero_NS_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
 function insertFormatting(comment,BBcode,id) {
@@ -94,4 +94,4 @@ $('.savedsearchterm').hover(
 
 </script>
 EOT;
-}
\ No newline at end of file
+}
diff --git a/view/theme/darkzero/theme.php b/view/theme/darkzero/theme.php
index ceafdf5956..1fe4bf859c 100644
--- a/view/theme/darkzero/theme.php
+++ b/view/theme/darkzero/theme.php
@@ -8,12 +8,12 @@
  * Maintainer: Mike Macgirvin <mike@macgirvin.com>
  */
 
+function darkzero_init(&$a) {
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
 set_template_engine($a, 'smarty3');
 
-function darkzero_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
 function insertFormatting(comment,BBcode,id) {
diff --git a/view/theme/diabook/ch_directory_item.tpl b/view/theme/diabook/ch_directory_item.tpl
index db1936e4b7..f32f5a4f78 100644
--- a/view/theme/diabook/ch_directory_item.tpl
+++ b/view/theme/diabook/ch_directory_item.tpl
@@ -2,8 +2,8 @@
 <div class="directory-item" id="directory-item-$id" >
 	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
 		<div class="directory-photo" id="directory-photo-$id" >
-			<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
-				<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
+			<a href="$profile_link" class="directory-profile-link" id="directory-profile-link-$id" >
+				<img class="directory-photo-img" src="$photo" alt="$alt_text" title="$alt_text" />
 			</a>
 		</div>
 	</div>
diff --git a/view/theme/diabook/mail_display.tpl b/view/theme/diabook/mail_display.tpl
index 5d16bd32bb..2b680ae428 100644
--- a/view/theme/diabook/mail_display.tpl
+++ b/view/theme/diabook/mail_display.tpl
@@ -3,9 +3,9 @@
 	<a href="message/dropconv/$thread_id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
 </div>
 
-{{ for $mails as $mail_item }}
+{{ for $mails as $mail }}
 	<div id="tread-wrapper-$mail_item.id" class="tread-wrapper">
-		{{ inc mail_conv.tpl with $mail=$mail_item }}{{endinc}}
+		{{ inc mail_conv.tpl }}{{endinc}}
 	</div>
 {{ endfor }}
 
diff --git a/view/theme/diabook/smarty3/admin_users.tpl b/view/theme/diabook/smarty3/admin_users.tpl
index 1bc1949b8b..f870e0e771 100644
--- a/view/theme/diabook/smarty3/admin_users.tpl
+++ b/view/theme/diabook/smarty3/admin_users.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script>
 	function confirm_delete(uname){
 		return confirm( "{{$confirm_delete}}".format(uname));
diff --git a/view/theme/diabook/smarty3/bottom.tpl b/view/theme/diabook/smarty3/bottom.tpl
index 65de108e84..7d8f63d169 100644
--- a/view/theme/diabook/smarty3/bottom.tpl
+++ b/view/theme/diabook/smarty3/bottom.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script type="text/javascript" src="{{$baseurl}}/view/theme/diabook/js/jquery.autogrow.textarea.js"></script>
 <script type="text/javascript">
 
diff --git a/view/theme/diabook/smarty3/ch_directory_item.tpl b/view/theme/diabook/smarty3/ch_directory_item.tpl
index 5fb119861a..2d2d968ca4 100644
--- a/view/theme/diabook/smarty3/ch_directory_item.tpl
+++ b/view/theme/diabook/smarty3/ch_directory_item.tpl
@@ -1,9 +1,14 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="directory-item" id="directory-item-{{$id}}" >
 	<div class="directory-photo-wrapper" id="directory-photo-wrapper-{{$id}}" > 
 		<div class="directory-photo" id="directory-photo-{{$id}}" >
-			<a href="{{$profile}}-link" class="directory-profile-link" id="directory-profile-link-{{$id}}" >
-				<img class="directory-photo-img" src="{{$photo}}" alt="{{$alt}}-text" title="{{$alt}}-text" />
+			<a href="{{$profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$id}}" >
+				<img class="directory-photo-img" src="{{$photo}}" alt="{{$alt_text}}" title="{{$alt_text}}" />
 			</a>
 		</div>
 	</div>
diff --git a/view/theme/diabook/smarty3/comment_item.tpl b/view/theme/diabook/smarty3/comment_item.tpl
index 1dde07dc05..c38991f52a 100644
--- a/view/theme/diabook/smarty3/comment_item.tpl
+++ b/view/theme/diabook/smarty3/comment_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
 			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
 				<input type="hidden" name="type" value="{{$type}}" />
diff --git a/view/theme/diabook/smarty3/communityhome.tpl b/view/theme/diabook/smarty3/communityhome.tpl
index 7895fd731d..197577f309 100644
--- a/view/theme/diabook/smarty3/communityhome.tpl
+++ b/view/theme/diabook/smarty3/communityhome.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div id="twittersettings" style="display:none">
 <form id="twittersettingsform" action="network" method="post" >
diff --git a/view/theme/diabook/smarty3/contact_template.tpl b/view/theme/diabook/smarty3/contact_template.tpl
index 790431a9f3..8143a82808 100644
--- a/view/theme/diabook/smarty3/contact_template.tpl
+++ b/view/theme/diabook/smarty3/contact_template.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" >
 	<div class="contact-entry-photo-wrapper" >
diff --git a/view/theme/diabook/smarty3/directory_item.tpl b/view/theme/diabook/smarty3/directory_item.tpl
index 84b4ada0fe..5394287642 100644
--- a/view/theme/diabook/smarty3/directory_item.tpl
+++ b/view/theme/diabook/smarty3/directory_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="directory-item" id="directory-item-{{$id}}" >
 	<div class="directory-photo-wrapper" id="directory-photo-wrapper-{{$id}}" > 
diff --git a/view/theme/diabook/smarty3/footer.tpl b/view/theme/diabook/smarty3/footer.tpl
index 25058a7ff7..459a229fa9 100644
--- a/view/theme/diabook/smarty3/footer.tpl
+++ b/view/theme/diabook/smarty3/footer.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="footerbox" style="display:none">
 <a style="float:right; color:#333;margin-right:10px;display: table;margin-top: 5px;" href="friendica" title="Site Info / Impressum" >Info / Impressum</a>
 </div>
\ No newline at end of file
diff --git a/view/theme/diabook/smarty3/generic_links_widget.tpl b/view/theme/diabook/smarty3/generic_links_widget.tpl
index b90c8fc8c6..1e0805acaa 100644
--- a/view/theme/diabook/smarty3/generic_links_widget.tpl
+++ b/view/theme/diabook/smarty3/generic_links_widget.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="widget_{{$title}}">
 	{{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">{{$title}}</h3>{{/if}}
 	{{if $desc}}<div class="desc">{{$desc}}</div>{{/if}}
diff --git a/view/theme/diabook/smarty3/group_side.tpl b/view/theme/diabook/smarty3/group_side.tpl
index f7ceb06419..45f2e171f1 100644
--- a/view/theme/diabook/smarty3/group_side.tpl
+++ b/view/theme/diabook/smarty3/group_side.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="profile_side" >
 	<div class="">
 		<h3 style="margin-left: 2px;">{{$title}}<a href="group/new" title="{{$createtext}}" class="icon text_add"></a></h3>
diff --git a/view/theme/diabook/smarty3/jot.tpl b/view/theme/diabook/smarty3/jot.tpl
index 87290d5e55..aa57d17570 100644
--- a/view/theme/diabook/smarty3/jot.tpl
+++ b/view/theme/diabook/smarty3/jot.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div id="profile-jot-wrapper" >
 	<div id="profile-jot-banner-wrapper">
diff --git a/view/theme/diabook/smarty3/login.tpl b/view/theme/diabook/smarty3/login.tpl
index a6e8e9dec6..797c33ff94 100644
--- a/view/theme/diabook/smarty3/login.tpl
+++ b/view/theme/diabook/smarty3/login.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <form action="{{$dest_url}}" method="post" >
 	<input type="hidden" name="auth-params" value="login" />
diff --git a/view/theme/diabook/smarty3/mail_conv.tpl b/view/theme/diabook/smarty3/mail_conv.tpl
index e7a313ed8f..915d4c13a7 100644
--- a/view/theme/diabook/smarty3/mail_conv.tpl
+++ b/view/theme/diabook/smarty3/mail_conv.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="wall-item-container {{$item.indent}}">
 	<div class="wall-item-item">
 		<div class="wall-item-info">
diff --git a/view/theme/diabook/smarty3/mail_display.tpl b/view/theme/diabook/smarty3/mail_display.tpl
index 7a96cbf361..dc1fbbc6f5 100644
--- a/view/theme/diabook/smarty3/mail_display.tpl
+++ b/view/theme/diabook/smarty3/mail_display.tpl
@@ -1,11 +1,16 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="mail-display-subject">
 	<span class="{{if $thread_seen}}seen{{else}}unseen{{/if}}">{{$thread_subject}}</span>
 	<a href="message/dropconv/{{$thread_id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="mail-delete icon s22 delete"></a>
 </div>
 
-{{foreach $mails as $mail_item}}
+{{foreach $mails as $mail}}
 	<div id="tread-wrapper-{{$mail_item.id}}" class="tread-wrapper">
-		{{include file="mail_conv.tpl" mail=$mail_item}}
+		{{include file="mail_conv.tpl"}}
 	</div>
 {{/foreach}}
 
diff --git a/view/theme/diabook/smarty3/mail_list.tpl b/view/theme/diabook/smarty3/mail_list.tpl
index 3342559184..9dde46bc80 100644
--- a/view/theme/diabook/smarty3/mail_list.tpl
+++ b/view/theme/diabook/smarty3/mail_list.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="mail-list-wrapper">
 	<span class="mail-subject {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
 	<span class="mail-from">{{$from_name}}</span>
diff --git a/view/theme/diabook/smarty3/message_side.tpl b/view/theme/diabook/smarty3/message_side.tpl
index c8a372c744..723b0b710c 100644
--- a/view/theme/diabook/smarty3/message_side.tpl
+++ b/view/theme/diabook/smarty3/message_side.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="message-sidebar" class="widget">
 	<div id="message-new" class="{{if $new.sel}}selected{{/if}}"><a href="{{$new.url}}">{{$new.label}}</a> </div>
 	
diff --git a/view/theme/diabook/smarty3/nav.tpl b/view/theme/diabook/smarty3/nav.tpl
index 0345141089..45dc476141 100644
--- a/view/theme/diabook/smarty3/nav.tpl
+++ b/view/theme/diabook/smarty3/nav.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <header>
 	<div id="site-location">{{$sitelocation}}</div>
 	<div id="banner">{{$banner}}</div>
diff --git a/view/theme/diabook/smarty3/nets.tpl b/view/theme/diabook/smarty3/nets.tpl
index 26e6b0106c..b9c6b828ff 100644
--- a/view/theme/diabook/smarty3/nets.tpl
+++ b/view/theme/diabook/smarty3/nets.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="profile_side">
 	<h3 style="margin-left: 2px;">{{$title}}</h3>
 	<div id="nets-desc">{{$desc}}</div>
diff --git a/view/theme/diabook/smarty3/oembed_video.tpl b/view/theme/diabook/smarty3/oembed_video.tpl
index 2d73f8d502..993b410e0b 100644
--- a/view/theme/diabook/smarty3/oembed_video.tpl
+++ b/view/theme/diabook/smarty3/oembed_video.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <a class="embed_yt" href='{{$embedurl}}' onclick='this.innerHTML=Base64.decode("{{$escapedhtml}}"); yt_iframe();javascript:$(this).parent().css("height", "450px"); return false;' style='float:left; margin: 1em; position: relative;'>
 	<img width='{{$tw}}' height='{{$th}}' src='{{$turl}}' >
 	<div style='position: absolute; top: 0px; left: 0px; width: {{$twpx}}; height: {{$thpx}}; background: url(images/icons/48/play.png) no-repeat center center;'></div>
diff --git a/view/theme/diabook/smarty3/photo_item.tpl b/view/theme/diabook/smarty3/photo_item.tpl
index 3eeb6bcd23..344c58a0b6 100644
--- a/view/theme/diabook/smarty3/photo_item.tpl
+++ b/view/theme/diabook/smarty3/photo_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $indent}}{{else}}
 <div class="wall-item-decor">
 	<img id="like-rotator-{{$id}}" class="like-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
diff --git a/view/theme/diabook/smarty3/photo_view.tpl b/view/theme/diabook/smarty3/photo_view.tpl
index f4c713afe9..e3908be006 100644
--- a/view/theme/diabook/smarty3/photo_view.tpl
+++ b/view/theme/diabook/smarty3/photo_view.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="live-display"></div>
 <h3><a href="{{$album.0}}">{{$album.1}}</a></h3>
 
diff --git a/view/theme/diabook/smarty3/profile_side.tpl b/view/theme/diabook/smarty3/profile_side.tpl
index 8d1ff976b7..267afc76a0 100644
--- a/view/theme/diabook/smarty3/profile_side.tpl
+++ b/view/theme/diabook/smarty3/profile_side.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="profile_side">
 	<div id="ps-usernameicon">
 		<a href="{{$ps.usermenu.status.0}}" title="{{$userinfo.name}}">
diff --git a/view/theme/diabook/smarty3/profile_vcard.tpl b/view/theme/diabook/smarty3/profile_vcard.tpl
index ee3e5a2a45..f2eda1b2d0 100644
--- a/view/theme/diabook/smarty3/profile_vcard.tpl
+++ b/view/theme/diabook/smarty3/profile_vcard.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="vcard">
 
 	<div class="tool">
diff --git a/view/theme/diabook/smarty3/prv_message.tpl b/view/theme/diabook/smarty3/prv_message.tpl
index 594411eb66..2daf54ecd6 100644
--- a/view/theme/diabook/smarty3/prv_message.tpl
+++ b/view/theme/diabook/smarty3/prv_message.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h3>{{$header}}</h3>
 
diff --git a/view/theme/diabook/smarty3/right_aside.tpl b/view/theme/diabook/smarty3/right_aside.tpl
index 8b11356e8a..d361840262 100644
--- a/view/theme/diabook/smarty3/right_aside.tpl
+++ b/view/theme/diabook/smarty3/right_aside.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="profile_side">
 	<div id="ps-usernameicon">
 		<a href="{{$ps.usermenu.status.0}}" title="{{$userinfo.name}}">
diff --git a/view/theme/diabook/smarty3/search_item.tpl b/view/theme/diabook/smarty3/search_item.tpl
index 0544e5e08c..d48103298c 100644
--- a/view/theme/diabook/smarty3/search_item.tpl
+++ b/view/theme/diabook/smarty3/search_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $item.indent}}{{else}}
 <div class="wall-item-decor">
 	<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
diff --git a/view/theme/diabook/smarty3/theme_settings.tpl b/view/theme/diabook/smarty3/theme_settings.tpl
index fe4340a29f..5532d402cf 100644
--- a/view/theme/diabook/smarty3/theme_settings.tpl
+++ b/view/theme/diabook/smarty3/theme_settings.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{include file="field_select.tpl" field=$color}}
 
 {{include file="field_select.tpl" field=$font_size}}
diff --git a/view/theme/diabook/smarty3/wall_thread.tpl b/view/theme/diabook/smarty3/wall_thread.tpl
index e721226572..be143cfbaa 100644
--- a/view/theme/diabook/smarty3/wall_thread.tpl
+++ b/view/theme/diabook/smarty3/wall_thread.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $item.comment_firstcollapsed}}
 	<div class="hide-comments-outer">
 	<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
@@ -134,7 +139,7 @@
 
 
 {{foreach $item.children as $child_item}}
-	{{include file="file:{{$child_item.template}}" item=$child_item}}
+	{{include file="{{$child_item.template}}" item=$child_item}}
 {{/foreach}}
 
 </div>
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 6a11091184..1ec98e877a 100644
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -7,9 +7,6 @@
  * Author:
  */
 
-$a = get_app();
-set_template_engine($a, 'smarty3');
-
 function get_diabook_config($key, $default = false) {
 	if (local_user()) {
 		$result = get_pconfig(local_user(), "diabook", $key);
@@ -26,6 +23,8 @@ function get_diabook_config($key, $default = false) {
 
 function diabook_init(&$a) {
 
+set_template_engine($a, 'smarty3');
+
 //print diabook-version for debugging
 $diabook_version = "Diabook (Version: 1.027)";
 $a->page['htmlhead'] .= sprintf('<META NAME=generator CONTENT="%s"/>', $diabook_version);
@@ -393,9 +392,9 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 			$profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
 			$entry = replace_macros($tpl,array(
 				'$id' => $rr['id'],
-				'$profile-link' => zrl($rr['url']),
+				'$profile_link' => zrl($rr['url']),
 				'$photo' => $rr[$photo],
-				'$alt-text' => $rr['name'],
+				'$alt_text' => $rr['name'],
 			));
 			$aside['$comunity_profiles_items'][] = $entry;
 		}
@@ -422,9 +421,9 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 			$profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
 			$entry = replace_macros($tpl,array(
 				'$id' => $rr['id'],
-				'$profile-link' => $profile_link,
+				'$profile_link' => $profile_link,
 				'$photo' => $a->get_cached_avatar_image($rr[$photo]),
-				'$alt-text' => $rr['name'],
+				'$alt_text' => $rr['name'],
 			));
 			$aside['$lastusers_items'][] = $entry;
 		}
@@ -501,9 +500,9 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 
 			$entry = replace_macros($tpl,array(
 				'$id' => $rr['id'],
-				'$profile-link' => $photo_page,
+				'$profile_link' => $photo_page,
 				'$photo' => $photo_url,
-				'$alt-text' => $rr['username']." : ".$rr['desc'],
+				'$alt_text' => $rr['username']." : ".$rr['desc'],
 			));
 
 			$aside['$photos_items'][] = $entry;
diff --git a/view/theme/dispy/dark/theme.php b/view/theme/dispy/dark/theme.php
index 21d27f75ee..090df1af2a 100644
--- a/view/theme/dispy/dark/theme.php
+++ b/view/theme/dispy/dark/theme.php
@@ -8,14 +8,13 @@
  * Screenshot: <a href="screenshot.jpg">Screenshot</a>
  */
 
-$a = get_app();
-$a->theme_info = array(
-    'family' => 'dispy',
-    'name' => 'dark',
-);
-set_template_engine($a, 'smarty3');
-
 function dispy_dark_init(&$a) {
+	$a->theme_info = array(
+		'family' => 'dispy',
+		'name' => 'dark',
+	);
+	set_template_engine($a, 'smarty3');
+
     /** @purpose set some theme defaults
     */
     $cssFile = null;
diff --git a/view/theme/dispy/light/theme.php b/view/theme/dispy/light/theme.php
index f8753ec1aa..7365727c77 100644
--- a/view/theme/dispy/light/theme.php
+++ b/view/theme/dispy/light/theme.php
@@ -8,15 +8,14 @@
  * Screenshot: <a href="screenshot.jpg">Screenshot</a>
  */
 
-$a = get_app();
-$a->theme_info = array(
-    'family' => 'dispy',
-	'name' => 'light',
-);
-set_template_engine($a, 'smarty3');
-
 function dispy_light_init(&$a) {
 
+	$a->theme_info = array(
+		'family' => 'dispy',
+		'name' => 'light',
+	);
+	set_template_engine($a, 'smarty3');
+
     /** @purpose set some theme defaults
     */
     $cssFile = null;
diff --git a/view/theme/dispy/smarty3/bottom.tpl b/view/theme/dispy/smarty3/bottom.tpl
index 984ffd03eb..49487240dc 100644
--- a/view/theme/dispy/smarty3/bottom.tpl
+++ b/view/theme/dispy/smarty3/bottom.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script type="text/javascript" src="{{$baseurl}}/view/theme/dispy/js/jquery.autogrow.textarea.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
diff --git a/view/theme/dispy/smarty3/comment_item.tpl b/view/theme/dispy/smarty3/comment_item.tpl
index e506ebb537..136ed2d36f 100644
--- a/view/theme/dispy/smarty3/comment_item.tpl
+++ b/view/theme/dispy/smarty3/comment_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
 			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
 				<input type="hidden" name="type" value="{{$type}}" />
diff --git a/view/theme/dispy/smarty3/communityhome.tpl b/view/theme/dispy/smarty3/communityhome.tpl
index abc2d0ec72..83749ae366 100644
--- a/view/theme/dispy/smarty3/communityhome.tpl
+++ b/view/theme/dispy/smarty3/communityhome.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $page}}
 <div>{{$page}}</div>
 {{/if}}
diff --git a/view/theme/dispy/smarty3/contact_template.tpl b/view/theme/dispy/smarty3/contact_template.tpl
index a25f210869..800e19b142 100644
--- a/view/theme/dispy/smarty3/contact_template.tpl
+++ b/view/theme/dispy/smarty3/contact_template.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" >
 	<div class="contact-entry-photo-wrapper">
diff --git a/view/theme/dispy/smarty3/conversation.tpl b/view/theme/dispy/smarty3/conversation.tpl
index 302f7172b5..e8cf720717 100644
--- a/view/theme/dispy/smarty3/conversation.tpl
+++ b/view/theme/dispy/smarty3/conversation.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$live_update}}
 
 {{foreach $threads as $thread}}
@@ -11,7 +16,7 @@
 		{{/if}}
 		{{if $item.comment_lastcollapsed}}</div>{{/if}}
 		
-		{{include file="file:{{$item.template}}"}}
+		{{include file="{{$item.template}}"}}
 		
 		
 	{{/foreach}}
diff --git a/view/theme/dispy/smarty3/group_side.tpl b/view/theme/dispy/smarty3/group_side.tpl
index 14c11febf1..33250b694b 100644
--- a/view/theme/dispy/smarty3/group_side.tpl
+++ b/view/theme/dispy/smarty3/group_side.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="group-sidebar" class="widget">
 <h3 class="label">{{$title}}</h3>
 
diff --git a/view/theme/dispy/smarty3/head.tpl b/view/theme/dispy/smarty3/head.tpl
index 4f5cdef15f..c633d1c42a 100644
--- a/view/theme/dispy/smarty3/head.tpl
+++ b/view/theme/dispy/smarty3/head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta charset="UTF-8" />
 <base href="{{$baseurl}}/" />
diff --git a/view/theme/dispy/smarty3/header.tpl b/view/theme/dispy/smarty3/header.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/theme/dispy/smarty3/header.tpl
+++ b/view/theme/dispy/smarty3/header.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/theme/dispy/smarty3/jot-header.tpl b/view/theme/dispy/smarty3/jot-header.tpl
index a66332780b..247d11cd9e 100644
--- a/view/theme/dispy/smarty3/jot-header.tpl
+++ b/view/theme/dispy/smarty3/jot-header.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script type="text/javascript">
 var editor=false;
 var textlen = 0;
diff --git a/view/theme/dispy/smarty3/jot.tpl b/view/theme/dispy/smarty3/jot.tpl
index b57f94cf0e..24dc68462a 100644
--- a/view/theme/dispy/smarty3/jot.tpl
+++ b/view/theme/dispy/smarty3/jot.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <form id="profile-jot-form" action="{{$action}}" method="post">
 	<div id="jot">
 		<div id="profile-jot-desc" class="jothidden">&#160;</div>
diff --git a/view/theme/dispy/smarty3/lang_selector.tpl b/view/theme/dispy/smarty3/lang_selector.tpl
index 945cbf51e3..a1aee8277f 100644
--- a/view/theme/dispy/smarty3/lang_selector.tpl
+++ b/view/theme/dispy/smarty3/lang_selector.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="lang-select-icon" class="icon s22 language" title="{{$title}}" onclick="openClose('language-selector');" ></div>
 <div id="language-selector" style="display: none;" >
 	<form action="#" method="post" >
diff --git a/view/theme/dispy/smarty3/mail_head.tpl b/view/theme/dispy/smarty3/mail_head.tpl
index c362eb6ed6..54a0cd471e 100644
--- a/view/theme/dispy/smarty3/mail_head.tpl
+++ b/view/theme/dispy/smarty3/mail_head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h3>{{$messages}}</h3>
 
 <div class="tabs-wrapper">
diff --git a/view/theme/dispy/smarty3/nav.tpl b/view/theme/dispy/smarty3/nav.tpl
index 401c2d30be..e240821057 100644
--- a/view/theme/dispy/smarty3/nav.tpl
+++ b/view/theme/dispy/smarty3/nav.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <nav id="pagenav">
 
 <div id="banner">{{$banner}}</div>
diff --git a/view/theme/dispy/smarty3/photo_edit.tpl b/view/theme/dispy/smarty3/photo_edit.tpl
index 16c9577eb4..3a3dcaca76 100644
--- a/view/theme/dispy/smarty3/photo_edit.tpl
+++ b/view/theme/dispy/smarty3/photo_edit.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <form action="photos/{{$nickname}}/{{$resource_id}}" method="post" id="photo_edit_form" >
 
diff --git a/view/theme/dispy/smarty3/photo_view.tpl b/view/theme/dispy/smarty3/photo_view.tpl
index 913cbb732c..cfc8868edf 100644
--- a/view/theme/dispy/smarty3/photo_view.tpl
+++ b/view/theme/dispy/smarty3/photo_view.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="live-display"></div>
 <h3><a href="{{$album.0}}">{{$album.1}}</a></h3>
 
diff --git a/view/theme/dispy/smarty3/profile_vcard.tpl b/view/theme/dispy/smarty3/profile_vcard.tpl
index 55c78e9c50..01633716d2 100644
--- a/view/theme/dispy/smarty3/profile_vcard.tpl
+++ b/view/theme/dispy/smarty3/profile_vcard.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="vcard">
 
 	{{if $profile.edit}}
diff --git a/view/theme/dispy/smarty3/saved_searches_aside.tpl b/view/theme/dispy/smarty3/saved_searches_aside.tpl
index 5771d7925e..0d9c0747ff 100644
--- a/view/theme/dispy/smarty3/saved_searches_aside.tpl
+++ b/view/theme/dispy/smarty3/saved_searches_aside.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="widget" id="saved-search-list">
 	<h3 id="search">{{$title}}</h3>
 	{{$searchbox}}
diff --git a/view/theme/dispy/smarty3/search_item.tpl b/view/theme/dispy/smarty3/search_item.tpl
index a78bbcf0d1..8d406514c3 100644
--- a/view/theme/dispy/smarty3/search_item.tpl
+++ b/view/theme/dispy/smarty3/search_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="wall-item-outside-wrapper {{$item.indent}} {{$item.shiny}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
 	<div class="wall-item-content-wrapper {{$item.indent}} {{$item.shiny}}" id="wall-item-content-wrapper-{{$item.id}}" >
 		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
diff --git a/view/theme/dispy/smarty3/theme_settings.tpl b/view/theme/dispy/smarty3/theme_settings.tpl
index 9fcf76b883..7475db28ba 100644
--- a/view/theme/dispy/smarty3/theme_settings.tpl
+++ b/view/theme/dispy/smarty3/theme_settings.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{include file="field_select.tpl" field=$colour}}
 
 {{include file="field_select.tpl" field=$font_size}}
diff --git a/view/theme/dispy/smarty3/threaded_conversation.tpl b/view/theme/dispy/smarty3/threaded_conversation.tpl
index 367698beeb..9718d0e85d 100644
--- a/view/theme/dispy/smarty3/threaded_conversation.tpl
+++ b/view/theme/dispy/smarty3/threaded_conversation.tpl
@@ -1,7 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$live_update}}
 
 {{foreach $threads as $thread}}
-{{include file="file:{{$thread.template}}" item=$thread}}
+{{include file="{{$thread.template}}" item=$thread}}
 {{/foreach}}
 
 <div id="conversation-end"></div>
diff --git a/view/theme/dispy/smarty3/wall_thread.tpl b/view/theme/dispy/smarty3/wall_thread.tpl
index b0de88e34a..94620ad530 100644
--- a/view/theme/dispy/smarty3/wall_thread.tpl
+++ b/view/theme/dispy/smarty3/wall_thread.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $item.comment_firstcollapsed}}
 	<div class="hide-comments-outer">
 	<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
@@ -132,7 +137,7 @@ class="icon recycle wall-item-share-buttons"  title="{{$item.vote.share.0}}" onc
 <div class="wall-item-outside-wrapper-end {{$item.indent}} {{$item.shiny}}" ></div>
 </div>
 {{foreach $item.children as $child}}
-	{{include file="file:{{$child.template}}" item=$child}}
+	{{include file="{{$child.template}}" item=$child}}
 {{/foreach}}
 
 </div>
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index a1de5498e6..d0b7e19d76 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -17,15 +17,14 @@
  * or rename to prefix1_function_name (prefix2_function_name), etc.
  */
 
-$a = get_app();
-$a->theme_info = array(
-    'family' => 'dispy',
-	'version' => '1.2.2'
-);
-set_template_engine($a, 'smarty3');
-
 function dispy_init(&$a) {
 
+	$a->theme_info = array(
+		'family' => 'dispy',
+		'version' => '1.2.2'
+	);
+	set_template_engine($a, 'smarty3');
+
     /** @purpose set some theme defaults
     */
     $cssFile = null;
diff --git a/view/theme/duepuntozero/smarty3/comment_item.tpl b/view/theme/duepuntozero/smarty3/comment_item.tpl
index 67b9fb08ec..edf19395b4 100644
--- a/view/theme/duepuntozero/smarty3/comment_item.tpl
+++ b/view/theme/duepuntozero/smarty3/comment_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 		{{if $threaded}}
 		<div class="comment-wwedit-wrapper threaded" id="comment-edit-wrapper-{{$id}}" style="display: block;">
 		{{else}}
diff --git a/view/theme/duepuntozero/smarty3/lang_selector.tpl b/view/theme/duepuntozero/smarty3/lang_selector.tpl
index 945cbf51e3..a1aee8277f 100644
--- a/view/theme/duepuntozero/smarty3/lang_selector.tpl
+++ b/view/theme/duepuntozero/smarty3/lang_selector.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="lang-select-icon" class="icon s22 language" title="{{$title}}" onclick="openClose('language-selector');" ></div>
 <div id="language-selector" style="display: none;" >
 	<form action="#" method="post" >
diff --git a/view/theme/duepuntozero/smarty3/moderated_comment.tpl b/view/theme/duepuntozero/smarty3/moderated_comment.tpl
index 8fbdf4bc4b..b2401ca483 100644
--- a/view/theme/duepuntozero/smarty3/moderated_comment.tpl
+++ b/view/theme/duepuntozero/smarty3/moderated_comment.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
 			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
 				<input type="hidden" name="type" value="{{$type}}" />
diff --git a/view/theme/duepuntozero/smarty3/nav.tpl b/view/theme/duepuntozero/smarty3/nav.tpl
index 2baebda441..24c48403fe 100644
--- a/view/theme/duepuntozero/smarty3/nav.tpl
+++ b/view/theme/duepuntozero/smarty3/nav.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <nav>
 	{{$langselector}}
 
diff --git a/view/theme/duepuntozero/smarty3/profile_vcard.tpl b/view/theme/duepuntozero/smarty3/profile_vcard.tpl
index 91630b0ec3..85c6345d6d 100644
--- a/view/theme/duepuntozero/smarty3/profile_vcard.tpl
+++ b/view/theme/duepuntozero/smarty3/profile_vcard.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="vcard">
 
 	<div class="fn label">{{$profile.name}}</div>
diff --git a/view/theme/duepuntozero/smarty3/prv_message.tpl b/view/theme/duepuntozero/smarty3/prv_message.tpl
index f8cbd01cc7..1f41d26628 100644
--- a/view/theme/duepuntozero/smarty3/prv_message.tpl
+++ b/view/theme/duepuntozero/smarty3/prv_message.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h3>{{$header}}</h3>
 
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index a7dc14e9e2..f23ed83a51 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -3304,4 +3304,8 @@ ul.menu-popup {
 }
 #div_id_remember input {
 	width: 20px;
-}
\ No newline at end of file
+}
+
+.shared_header span {
+	margin-left: 10px;
+}
diff --git a/view/theme/easterbunny/theme.php b/view/theme/easterbunny/theme.php
index 338f40cbfb..35796d10a2 100644
--- a/view/theme/easterbunny/theme.php
+++ b/view/theme/easterbunny/theme.php
@@ -1,4 +1,7 @@
 <?php
+
+function easterbunny_init(&$a) {
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
+}
diff --git a/view/theme/facepark/smarty3/comment_item.tpl b/view/theme/facepark/smarty3/comment_item.tpl
index 4118355fc3..9a0efdc233 100644
--- a/view/theme/facepark/smarty3/comment_item.tpl
+++ b/view/theme/facepark/smarty3/comment_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
 			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
 				<input type="hidden" name="type" value="{{$type}}" />
diff --git a/view/theme/facepark/smarty3/group_side.tpl b/view/theme/facepark/smarty3/group_side.tpl
index d2d8a77e23..139798beee 100644
--- a/view/theme/facepark/smarty3/group_side.tpl
+++ b/view/theme/facepark/smarty3/group_side.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="widget" id="group-sidebar">
 <h3>{{$title}}</h3>
 
diff --git a/view/theme/facepark/smarty3/jot.tpl b/view/theme/facepark/smarty3/jot.tpl
index 56b1b65404..16cc822bdd 100644
--- a/view/theme/facepark/smarty3/jot.tpl
+++ b/view/theme/facepark/smarty3/jot.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div id="profile-jot-wrapper" >
 	<div id="profile-jot-banner-wrapper">
diff --git a/view/theme/facepark/smarty3/nav.tpl b/view/theme/facepark/smarty3/nav.tpl
index 7f7bb6290f..6119a1a93d 100644
--- a/view/theme/facepark/smarty3/nav.tpl
+++ b/view/theme/facepark/smarty3/nav.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <nav>
 	{{$langselector}}
 
diff --git a/view/theme/facepark/smarty3/profile_vcard.tpl b/view/theme/facepark/smarty3/profile_vcard.tpl
index f7622bbb3d..343a0aafa8 100644
--- a/view/theme/facepark/smarty3/profile_vcard.tpl
+++ b/view/theme/facepark/smarty3/profile_vcard.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="vcard">
 
 	<div class="fn label">{{$profile.name}}</div>
diff --git a/view/theme/facepark/smarty3/search_item.tpl b/view/theme/facepark/smarty3/search_item.tpl
index ac650f465b..d6bf550074 100644
--- a/view/theme/facepark/smarty3/search_item.tpl
+++ b/view/theme/facepark/smarty3/search_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
 	<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" >
 		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
diff --git a/view/theme/facepark/theme.php b/view/theme/facepark/theme.php
index ec1ab1c671..e7203c6641 100644
--- a/view/theme/facepark/theme.php
+++ b/view/theme/facepark/theme.php
@@ -1,4 +1,6 @@
 <?php
+
+function facepark_init(&$a) {
 $a->theme_info = array();
 set_template_engine($a, 'smarty3');
 
@@ -48,3 +50,5 @@ $('.savedsearchterm').hover(
 
 </script>
 EOT;
+}
+
diff --git a/view/theme/frost-mobile/contacts-template.tpl b/view/theme/frost-mobile/contacts-template.tpl
index c7e3ca899d..76254c1ca8 100644
--- a/view/theme/frost-mobile/contacts-template.tpl
+++ b/view/theme/frost-mobile/contacts-template.tpl
@@ -15,8 +15,8 @@ $tabs
 
 
 <div id="contacts-display-wrapper">
-{{ for $contacts as $c }}
-	{{ inc contact_template.tpl with $contact=$c }}{{ endinc }}
+{{ for $contacts as $contact }}
+	{{ inc contact_template.tpl }}{{ endinc }}
 {{ endfor }}
 </div>
 <div id="contact-edit-end"></div>
diff --git a/view/theme/frost-mobile/js/acl.js b/view/theme/frost-mobile/js/acl.js
index 20f0d46189..d54df12a35 100644
--- a/view/theme/frost-mobile/js/acl.js
+++ b/view/theme/frost-mobile/js/acl.js
@@ -253,10 +253,9 @@ ACL.prototype.populate = function(data){
 		//console.log(html);
 		that.list_content.append(html);
 	});
-	$(".acl-list-item img[data-src]").each(function(i, el){
-		// Replace data-src attribute with src attribute for every image
-		$(el).attr('src', $(el).data("src"));
-		$(el).removeAttr("data-src");
+	$j(".acl-list-item img[data-src]", that.list_content).each(function(i, el){
+		// Add src attribute for images with a data-src attribute
+		$j(el).attr('src', $j(el).data("src"));
 	});
 	that.update_view();
 }
diff --git a/view/theme/frost-mobile/js/acl.min.js b/view/theme/frost-mobile/js/acl.min.js
index 890e853ce0..b543cbdd72 100644
--- a/view/theme/frost-mobile/js/acl.min.js
+++ b/view/theme/frost-mobile/js/acl.min.js
@@ -1 +1 @@
-function ACL(e,t){that=this,that.url=e,that.kp_timer=null,t==undefined&&(t=[]),that.allow_cid=t[0]||[],that.allow_gid=t[1]||[],that.deny_cid=t[2]||[],that.deny_gid=t[3]||[],that.group_uids=[],that.nw=2,that.list_content=$j("#acl-list-content"),that.item_tpl=unescape($j(".acl-list-item[rel=acl-template]").html()),that.showall=$j("#acl-showall"),t.length==0&&that.showall.addClass("selected"),that.showall.click(that.on_showall),$j(".acl-button-show").live("click",that.on_button_show),$j(".acl-button-hide").live("click",that.on_button_hide),$j("#acl-search").keypress(that.on_search),$j("#acl-wrapper").parents("form").submit(that.on_submit),that.get(0,100)}ACL.prototype.on_submit=function(){aclfileds=$j("#acl-fields").html(""),$j(that.allow_gid).each(function(e,t){aclfileds.append("<input type='hidden' name='group_allow[]' value='"+t+"'>")}),$j(that.allow_cid).each(function(e,t){aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+t+"'>")}),$j(that.deny_gid).each(function(e,t){aclfileds.append("<input type='hidden' name='group_deny[]' value='"+t+"'>")}),$j(that.deny_cid).each(function(e,t){aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+t+"'>")})},ACL.prototype.search=function(){var e=$j("#acl-search").val();that.list_content.html(""),that.get(0,100,e)},ACL.prototype.on_search=function(e){that.kp_timer&&clearTimeout(that.kp_timer),that.kp_timer=setTimeout(that.search,1e3)},ACL.prototype.on_showall=function(e){return e.preventDefault(),e.stopPropagation(),that.showall.hasClass("selected")?!1:(that.showall.addClass("selected"),that.allow_cid=[],that.allow_gid=[],that.deny_cid=[],that.deny_gid=[],that.update_view(),!1)},ACL.prototype.on_button_show=function(e){return e.preventDefault(),e.stopImmediatePropagation(),e.stopPropagation(),that.set_allow($j(this).parent().attr("id")),!1},ACL.prototype.on_button_hide=function(e){return e.preventDefault(),e.stopImmediatePropagation(),e.stopPropagation(),that.set_deny($j(this).parent().attr("id")),!1},ACL.prototype.set_allow=function(e){type=e[0],id=parseInt(e.substr(1));switch(type){case"g":that.allow_gid.indexOf(id)<0?that.allow_gid.push(id):that.allow_gid.remove(id),that.deny_gid.indexOf(id)>=0&&that.deny_gid.remove(id);break;case"c":that.allow_cid.indexOf(id)<0?that.allow_cid.push(id):that.allow_cid.remove(id),that.deny_cid.indexOf(id)>=0&&that.deny_cid.remove(id)}that.update_view()},ACL.prototype.set_deny=function(e){type=e[0],id=parseInt(e.substr(1));switch(type){case"g":that.deny_gid.indexOf(id)<0?that.deny_gid.push(id):that.deny_gid.remove(id),that.allow_gid.indexOf(id)>=0&&that.allow_gid.remove(id);break;case"c":that.deny_cid.indexOf(id)<0?that.deny_cid.push(id):that.deny_cid.remove(id),that.allow_cid.indexOf(id)>=0&&that.allow_cid.remove(id)}that.update_view()},ACL.prototype.update_view=function(){that.allow_gid.length==0&&that.allow_cid.length==0&&that.deny_gid.length==0&&that.deny_cid.length==0?(that.showall.addClass("selected"),$j("#jot-perms-icon").removeClass("lock").addClass("unlock"),$j("#jot-public").show(),$j(".profile-jot-net input").attr("disabled",!1),typeof editor!="undefined"&&editor!=0&&$j("#profile-jot-desc").html(ispublic)):(that.showall.removeClass("selected"),$j("#jot-perms-icon").removeClass("unlock").addClass("lock"),$j("#jot-public").hide(),$j(".profile-jot-net input").attr("disabled","disabled"),$j("#profile-jot-desc").html("&nbsp;")),$j("#acl-list-content .acl-list-item").each(function(){$j(this).removeClass("groupshow grouphide")}),$j("#acl-list-content .acl-list-item").each(function(){itemid=$j(this).attr("id"),type=itemid[0],id=parseInt(itemid.substr(1)),btshow=$j(this).children(".acl-button-show").removeClass("selected"),bthide=$j(this).children(".acl-button-hide").removeClass("selected");switch(type){case"g":var e="";that.allow_gid.indexOf(id)>=0&&(btshow.addClass("selected"),bthide.removeClass("selected"),e="groupshow"),that.deny_gid.indexOf(id)>=0&&(btshow.removeClass("selected"),bthide.addClass("selected"),e="grouphide"),$j(that.group_uids[id]).each(function(t,n){e=="grouphide"&&$j("#c"+n).removeClass("groupshow");if(e!=""){var r=$j("#c"+n).attr("class");if(r==undefined)return!0;var i=r.indexOf("grouphide");i==-1&&$j("#c"+n).addClass(e)}});break;case"c":that.allow_cid.indexOf(id)>=0&&(btshow.addClass("selected"),bthide.removeClass("selected")),that.deny_cid.indexOf(id)>=0&&(btshow.removeClass("selected"),bthide.addClass("selected"))}})},ACL.prototype.get=function(e,t,n){var r={start:e,count:t,search:n};$j.ajax({type:"POST",url:that.url,data:r,dataType:"json",success:that.populate})},ACL.prototype.populate=function(e){$j(e.items).each(function(){html="<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>",html=html.format(this.photo,this.name,this.type,this.id,"",this.network,this.link),this.uids!=undefined&&(that.group_uids[this.id]=this.uids),that.list_content.append(html)}),that.update_view()};
\ No newline at end of file
+function ACL(backend_url,preset){that=this;that.url=backend_url;that.kp_timer=null;if(preset==undefined)preset=[];that.allow_cid=preset[0]||[];that.allow_gid=preset[1]||[];that.deny_cid=preset[2]||[];that.deny_gid=preset[3]||[];that.group_uids=[];that.nw=2;that.list_content=$j("#acl-list-content");that.item_tpl=unescape($j(".acl-list-item[rel=acl-template]").html());that.showall=$j("#acl-showall");if(preset.length==0)that.showall.addClass("selected");that.showall.click(that.on_showall);$j(".acl-button-show").live("click",that.on_button_show);$j(".acl-button-hide").live("click",that.on_button_hide);$j("#acl-search").keypress(that.on_search);$j("#acl-wrapper").parents("form").submit(that.on_submit);that.get(0,100)}ACL.prototype.on_submit=function(){aclfileds=$j("#acl-fields").html("");$j(that.allow_gid).each(function(i,v){aclfileds.append("<input type='hidden' name='group_allow[]' value='"+v+"'>")});$j(that.allow_cid).each(function(i,v){aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+v+"'>")});$j(that.deny_gid).each(function(i,v){aclfileds.append("<input type='hidden' name='group_deny[]' value='"+v+"'>")});$j(that.deny_cid).each(function(i,v){aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>")})};ACL.prototype.search=function(){var srcstr=$j("#acl-search").val();that.list_content.html("");that.get(0,100,srcstr)};ACL.prototype.on_search=function(event){if(that.kp_timer)clearTimeout(that.kp_timer);that.kp_timer=setTimeout(that.search,1e3)};ACL.prototype.on_showall=function(event){event.preventDefault();event.stopPropagation();if(that.showall.hasClass("selected")){return false}that.showall.addClass("selected");that.allow_cid=[];that.allow_gid=[];that.deny_cid=[];that.deny_gid=[];that.update_view();return false};ACL.prototype.on_button_show=function(event){event.preventDefault();event.stopImmediatePropagation();event.stopPropagation();that.set_allow($j(this).parent().attr("id"));return false};ACL.prototype.on_button_hide=function(event){event.preventDefault();event.stopImmediatePropagation();event.stopPropagation();that.set_deny($j(this).parent().attr("id"));return false};ACL.prototype.set_allow=function(itemid){type=itemid[0];id=parseInt(itemid.substr(1));switch(type){case"g":if(that.allow_gid.indexOf(id)<0){that.allow_gid.push(id)}else{that.allow_gid.remove(id)}if(that.deny_gid.indexOf(id)>=0)that.deny_gid.remove(id);break;case"c":if(that.allow_cid.indexOf(id)<0){that.allow_cid.push(id)}else{that.allow_cid.remove(id)}if(that.deny_cid.indexOf(id)>=0)that.deny_cid.remove(id);break}that.update_view()};ACL.prototype.set_deny=function(itemid){type=itemid[0];id=parseInt(itemid.substr(1));switch(type){case"g":if(that.deny_gid.indexOf(id)<0){that.deny_gid.push(id)}else{that.deny_gid.remove(id)}if(that.allow_gid.indexOf(id)>=0)that.allow_gid.remove(id);break;case"c":if(that.deny_cid.indexOf(id)<0){that.deny_cid.push(id)}else{that.deny_cid.remove(id)}if(that.allow_cid.indexOf(id)>=0)that.allow_cid.remove(id);break}that.update_view()};ACL.prototype.update_view=function(){if(that.allow_gid.length==0&&that.allow_cid.length==0&&that.deny_gid.length==0&&that.deny_cid.length==0){that.showall.addClass("selected");$j("#jot-perms-icon").removeClass("lock").addClass("unlock");$j("#jot-public").show();$j(".profile-jot-net input").attr("disabled",false);if(typeof editor!="undefined"&&editor!=false){$j("#profile-jot-desc").html(ispublic)}}else{that.showall.removeClass("selected");$j("#jot-perms-icon").removeClass("unlock").addClass("lock");$j("#jot-public").hide();$j(".profile-jot-net input").attr("disabled","disabled");$j("#profile-jot-desc").html("&nbsp;")}$j("#acl-list-content .acl-list-item").each(function(){$j(this).removeClass("groupshow grouphide")});$j("#acl-list-content .acl-list-item").each(function(){itemid=$j(this).attr("id");type=itemid[0];id=parseInt(itemid.substr(1));btshow=$j(this).children(".acl-button-show").removeClass("selected");bthide=$j(this).children(".acl-button-hide").removeClass("selected");switch(type){case"g":var uclass="";if(that.allow_gid.indexOf(id)>=0){btshow.addClass("selected");bthide.removeClass("selected");uclass="groupshow"}if(that.deny_gid.indexOf(id)>=0){btshow.removeClass("selected");bthide.addClass("selected");uclass="grouphide"}$j(that.group_uids[id]).each(function(i,v){if(uclass=="grouphide")$j("#c"+v).removeClass("groupshow");if(uclass!=""){var cls=$j("#c"+v).attr("class");if(cls==undefined)return true;var hiding=cls.indexOf("grouphide");if(hiding==-1)$j("#c"+v).addClass(uclass)}});break;case"c":if(that.allow_cid.indexOf(id)>=0){btshow.addClass("selected");bthide.removeClass("selected")}if(that.deny_cid.indexOf(id)>=0){btshow.removeClass("selected");bthide.addClass("selected")}}})};ACL.prototype.get=function(start,count,search){var postdata={start:start,count:count,search:search};$j.ajax({type:"POST",url:that.url,data:postdata,dataType:"json",success:that.populate})};ACL.prototype.populate=function(data){$j(data.items).each(function(){html="<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>";html=html.format(this.photo,this.name,this.type,this.id,"",this.network,this.link);if(this.uids!=undefined)that.group_uids[this.id]=this.uids;that.list_content.append(html)});$j(".acl-list-item img[data-src]",that.list_content).each(function(i,el){$j(el).attr("src",$j(el).data("src"))});that.update_view()};
\ No newline at end of file
diff --git a/view/theme/frost-mobile/js/main.js b/view/theme/frost-mobile/js/main.js
index 197d496646..0773dcc024 100644
--- a/view/theme/frost-mobile/js/main.js
+++ b/view/theme/frost-mobile/js/main.js
@@ -188,10 +188,9 @@
 					nnm.append(html);
 				});
 
-				$("img[data-src]", nnm).each(function(i, el){
-					// Replace data-src attribute with src attribute for every image
-					$(el).attr('src', $(el).data("src"));
-					$(el).removeAttr("data-src");
+				$j("img[data-src]", nnm).each(function(i, el){
+					// Add src attribute for images with a data-src attribute
+					$j(el).attr('src', $j(el).data("src"));
 				});
 			}
 			notif = eNotif.attr('count');
diff --git a/view/theme/frost-mobile/js/main.min.js b/view/theme/frost-mobile/js/main.min.js
index 807c5327f2..fad629ce47 100644
--- a/view/theme/frost-mobile/js/main.min.js
+++ b/view/theme/frost-mobile/js/main.min.js
@@ -1 +1 @@
-function openClose(listID){listID="#"+listID.replace(/:/g,"\\:");listID=listID.replace(/\./g,"\\.");listID=listID.replace(/@/g,"\\@");if($j(listID).is(":visible")){$j(listID).hide();$j(listID+"-wrapper").show();alert($j(listID+"-wrapper").attr("id"))}else{$j(listID).show();$j(listID+"-wrapper").hide()}}function openMenu(theID){document.getElementById(theID).style.display="block"}function closeMenu(theID){document.getElementById(theID).style.display="none"}var src=null;var prev=null;var livetime=null;var msie=false;var stopped=false;var totStopped=false;var timer=null;var pr=0;var liking=0;var in_progress=false;var langSelect=false;var commentBusy=false;var last_popup_menu=null;var last_popup_button=null;$j(function(){$j.ajaxSetup({cache:false});msie=$j.browser.msie;collapseHeight();$j(".onoff input").each(function(){val=$j(this).val();id=$j(this).attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")});$j(".onoff > a").click(function(event){event.preventDefault();var input=$j(this).siblings("input");var val=1-input.val();var id=input.attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden");$j("#"+id+"_onoff ."+(val==1?"on":"off")).removeClass("hidden");input.val(val)});function close_last_popup_menu(e){if(last_popup_menu){if("#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")){last_popup_menu.hide();if(last_popup_menu.attr("id")=="nav-notifications-menu")$j(".main-container").show();last_popup_button.removeClass("selected");last_popup_menu=null;last_popup_button=null}}}$j("img[rel^=#]").click(function(e){close_last_popup_menu(e);menu=$j($j(this).attr("rel"));e.preventDefault();e.stopPropagation();if(menu.attr("popup")=="false")return false;if(menu.css("display")=="none"){$j(this).parent().addClass("selected");menu.show();if(menu.attr("id")=="nav-notifications-menu")$j(".main-container").hide();last_popup_menu=menu;last_popup_button=$j(this).parent()}else{$j(this).parent().removeClass("selected");menu.hide();if(menu.attr("id")=="nav-notifications-menu")$j(".main-container").show();last_popup_menu=null;last_popup_button=null}return false});$j("html").click(function(e){close_last_popup_menu(e)});var notifications_tpl=unescape($j("#nav-notifications-template[rel=template]").html());var notifications_all=unescape($j("<div>").append($j("#nav-notifications-see-all").clone()).html());var notifications_mark=unescape($j("<div>").append($j("#nav-notifications-mark-all").clone()).html());var notifications_empty=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,data){var invalid=$j(data).find("invalid").text();if(invalid==1){window.location.href=window.location.href}var net=$j(data).find("net").text();if(net==0){net="";$j("#net-update").removeClass("show")}else{$j("#net-update").addClass("show")}$j("#net-update").html(net);var home=$j(data).find("home").text();if(home==0){home="";$j("#home-update").removeClass("show")}else{$j("#home-update").addClass("show")}$j("#home-update").html(home);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update").removeClass("show")}else{$j("#intro-update").addClass("show")}$j("#intro-update").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update").removeClass("show")}else{$j("#mail-update").addClass("show")}$j("#mail-update").html(mail);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update-li").removeClass("show")}else{$j("#intro-update-li").addClass("show")}$j("#intro-update-li").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update-li").removeClass("show")}else{$j("#mail-update-li").addClass("show")}$j("#mail-update-li").html(mail);var eNotif=$j(data).find("notif");if(eNotif.children("note").length==0){$j("#nav-notifications-menu").html(notifications_empty)}else{nnm=$j("#nav-notifications-menu");nnm.html(notifications_all+notifications_mark);eNotif.children("note").each(function(){e=$j(this);text=e.text().format("<span class='contactname'>"+e.attr("name")+"</span>");html=notifications_tpl.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen"));nnm.append(html)})}notif=eNotif.attr("count");if(notif>0){$j("#nav-notifications-linkmenu").addClass("on")}else{$j("#nav-notifications-linkmenu").removeClass("on")}if(notif==0){notif="";$j("#notify-update").removeClass("show")}else{$j("#notify-update").addClass("show")}$j("#notify-update").html(notif);var eSysmsg=$j(data).find("sysmsgs");eSysmsg.children("notice").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"notice",life:1e3})});eSysmsg.children("info").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"info",life:1e3})})});NavUpdate()});function NavUpdate(){if(!stopped){var pingCmd="ping"+(localUser!=0?"?f=&uid="+localUser:"");$j.get(pingCmd,function(data){$j(data).find("result").each(function(){$j("nav").trigger("nav-update",this);if($j("#live-network").length){src="network";liveUpdate()}if($j("#live-profile").length){src="profile";liveUpdate()}if($j("#live-community").length){src="community";liveUpdate()}if($j("#live-notes").length){src="notes";liveUpdate()}if($j("#live-display").length){src="display";liveUpdate()}if($j("#live-photos").length){if(liking){liking=0;window.location.href=window.location.href}}})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$j(".like-rotator").hide();return}if($j(".comment-edit-text-full").length||in_progress){if(livetime){clearTimeout(livetime)}livetime=setTimeout(liveUpdate,1e4);return}if(livetime!=null)livetime=null;prev="live-"+src;in_progress=true;var udargs=netargs.length?"/"+netargs:"";var update_url="update_"+src+udargs+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$j.get(update_url,function(data){in_progress=false;$j(".toplevel_item",data).each(function(){var ident=$j(this).attr("id");if($j("#"+ident).length==0&&profile_page==1){$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("#"+prev).after($j(this))}else{var id=$j(".hide-comments-total",this).attr("id");if(typeof id!="undefined"){id=id.split("-")[3];var commentsOpen=$j("#collapsed-comments-"+id).is(":visible")}$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("html").height($j("html").height());$j("#"+ident).replaceWith($j(this));if(typeof id!="undefined"){if(commentsOpen)showHideComments(id)}$j("html").height("auto")}prev=ident});collapseHeight();$j(".like-rotator").hide();if(commentBusy){commentBusy=false;$j("body").css("cursor","auto")}$j(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl")})}function collapseHeight(elems){var elemName=".wall-item-body:not(.divmore)";if(typeof elems!="undefined"){elemName=elems+" "+elemName}$j(elemName).each(function(){if($j(this).height()>350){$j("html").height($j("html").height());$j(this).divgrow({initialHeight:300,showBrackets:false,speed:0});$j(this).addClass("divmore");$j("html").height("auto")}})}function imgbright(node){$j(node).removeClass("drophide").addClass("drop")}function imgdull(node){$j(node).removeClass("drop").addClass("drophide")}function dolike(ident,verb){unpause();$j("#like-rotator-"+ident.toString()).show();$j.get("like/"+ident.toString()+"?verb="+verb,NavUpdate);liking=1}function dostar(ident){ident=ident.toString();$j.get("starred/"+ident,function(data){if(data.match(/1/)){$j("#starred-"+ident).addClass("starred");$j("#starred-"+ident).removeClass("unstarred");$j("#star-"+ident).addClass("hidden");$j("#unstar-"+ident).removeClass("hidden")}else{$j("#starred-"+ident).addClass("unstarred");$j("#starred-"+ident).removeClass("starred");$j("#star-"+ident).removeClass("hidden");$j("#unstar-"+ident).addClass("hidden")}})}function getPosition(e){var cursor={x:0,y:0};if(e.touches[0].pageX||e.touches[0].pageY){cursor.x=e.touches[0].pageX;cursor.y=e.touches[0].pageY}else{if(e.touches[0].clientX||e.touches[0].clientY){cursor.x=e.touches[0].clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft;cursor.y=e.touches[0].clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop}else{if(e.touches[0].x||e.touches[0].y){cursor.touches[0].x=e.touches[0].x;cursor.touches[0].y=e.touches[0].y}}}return cursor}var lockvisible=false;function lockview(event,id){event=event||window.event;cursor=getPosition(event);if(lockvisible){lockviewhide()}else{lockvisible=true;$j.get("lockview/"+id,function(data){$j("#panel").html(data);$j("#panel").css({left:cursor.x+5,top:cursor.y+5});$j("#panel").show()})}}function lockviewhide(){lockvisible=false;$j("#panel").hide()}function post_comment(id){unpause();commentBusy=true;$j("body").css("cursor","wait");$j("#comment-preview-inp-"+id).val("0");$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.success){$j("#comment-edit-wrapper-"+id).hide();$j("#comment-edit-text-"+id).val("");var tarea=document.getElementById("comment-edit-text-"+id);if(tarea)commentClose(tarea,id);if(timer)clearTimeout(timer);timer=setTimeout(NavUpdate,10)}if(data.reload){window.location.href=data.reload}},"json");return false}function preview_comment(id){$j("#comment-preview-inp-"+id).val("1");$j("#comment-edit-preview-"+id).show();$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.preview){$j("#comment-edit-preview-"+id).html(data.preview);$j("#comment-edit-preview-"+id+" a").click(function(){return false})}},"json");return true}function showHideComments(id){if($j("#collapsed-comments-"+id).is(":visible")){$j("#collapsed-comments-"+id).hide();$j("#hide-comments-"+id).html(window.showMore)}else{$j("#collapsed-comments-"+id).show();$j("#hide-comments-"+id).html(window.showFewer);collapseHeight("#collapsed-comments-"+id)}}function preview_post(){$j("#jot-preview").val("1");$j("#jot-preview-content").show();tinyMCE.triggerSave();$j.post("item",$j("#profile-jot-form").serialize(),function(data){if(data.preview){$j("#jot-preview-content").html(data.preview);$j("#jot-preview-content"+" a").click(function(){return false})}},"json");$j("#jot-preview").val("0");return true}function unpause(){totStopped=false;stopped=false;$j("#pause").html("")}function bin2hex(s){var v,i,f=0,a=[];s+="";f=s.length;for(i=0;i<f;i++){a[i]=s.charCodeAt(i).toString(16).replace(/^([\da-f])$/,"0$1")}return a.join("")}function groupChangeMember(gid,cid,sec_token){$j("body .fakelink").css("cursor","wait");$j.get("group/"+gid+"/"+cid+"?t="+sec_token,function(data){$j("#group-update-wrapper").html(data);$j("body .fakelink").css("cursor","auto")})}function profChangeMember(gid,cid){$j("body .fakelink").css("cursor","wait");$j.get("profperm/"+gid+"/"+cid,function(data){$j("#prof-update-wrapper").html(data);$j("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(gid,cid){$j("body").css("cursor","wait");$j.get("contactgroup/"+gid+"/"+cid,function(data){$j("body").css("cursor","auto")})}function checkboxhighlight(box){if($j(box).is(":checked")){$j(box).addClass("checkeditem")}else{$j(box).removeClass("checkeditem")}}function notifyMarkAll(){$j.get("notify/mark/all",function(data){if(timer)clearTimeout(timer);timer=setTimeout(NavUpdate,1e3)})}function fcFileBrowser(field_name,url,type,win){var cmsURL=baseurl+"/fbrowser/"+type+"/";tinyMCE.activeEditor.windowManager.open({file:cmsURL,title:"File Browser",width:420,height:400,resizable:"yes",inline:"yes",close_previous:"no"},{window:win,input:field_name});return false}function setupFieldRichtext(){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:"fieldRichtext",plugins:"bbcode,paste, inlinepopups",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,force_p_newlines:false,force_br_newlines:true,forced_root_block:"",convert_urls:false,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:false,file_browser_callback:"fcFileBrowser"})}String.prototype.format=function(){var formatted=this;for(var i=0;i<arguments.length;i++){var regexp=new RegExp("\\{"+i+"\\}","gi");formatted=formatted.replace(regexp,arguments[i])}return formatted};Array.prototype.remove=function(item){to=undefined;from=this.indexOf(item);var rest=this.slice((to||from)+1||this.length);this.length=from<0?this.length+from:from;return this.push.apply(this,rest)};function previewTheme(elm){theme=$j(elm).val();$j.getJSON("pretheme?f=&theme="+theme,function(data){$j("#theme-preview").html('<div id="theme-desc">'+data.desc+'</div><div id="theme-version">'+data.version+'</div><div id="theme-credits">'+data.credits+"</div>")})}
\ No newline at end of file
+function openClose(listID){listID="#"+listID.replace(/:/g,"\\:");listID=listID.replace(/\./g,"\\.");listID=listID.replace(/@/g,"\\@");if($j(listID).is(":visible")){$j(listID).hide();$j(listID+"-wrapper").show();alert($j(listID+"-wrapper").attr("id"))}else{$j(listID).show();$j(listID+"-wrapper").hide()}}function openMenu(theID){document.getElementById(theID).style.display="block"}function closeMenu(theID){document.getElementById(theID).style.display="none"}var src=null;var prev=null;var livetime=null;var msie=false;var stopped=false;var totStopped=false;var timer=null;var pr=0;var liking=0;var in_progress=false;var langSelect=false;var commentBusy=false;var last_popup_menu=null;var last_popup_button=null;$j(function(){$j.ajaxSetup({cache:false});msie=$j.browser.msie;collapseHeight();$j(".onoff input").each(function(){val=$j(this).val();id=$j(this).attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")});$j(".onoff > a").click(function(event){event.preventDefault();var input=$j(this).siblings("input");var val=1-input.val();var id=input.attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden");$j("#"+id+"_onoff ."+(val==1?"on":"off")).removeClass("hidden");input.val(val)});function close_last_popup_menu(e){if(last_popup_menu){if("#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")){last_popup_menu.hide();if(last_popup_menu.attr("id")=="nav-notifications-menu")$j(".main-container").show();last_popup_button.removeClass("selected");last_popup_menu=null;last_popup_button=null}}}$j("img[rel^=#]").click(function(e){close_last_popup_menu(e);menu=$j($j(this).attr("rel"));e.preventDefault();e.stopPropagation();if(menu.attr("popup")=="false")return false;if(menu.css("display")=="none"){$j(this).parent().addClass("selected");menu.show();if(menu.attr("id")=="nav-notifications-menu")$j(".main-container").hide();last_popup_menu=menu;last_popup_button=$j(this).parent()}else{$j(this).parent().removeClass("selected");menu.hide();if(menu.attr("id")=="nav-notifications-menu")$j(".main-container").show();last_popup_menu=null;last_popup_button=null}return false});$j("html").click(function(e){close_last_popup_menu(e)});var notifications_tpl=unescape($j("#nav-notifications-template[rel=template]").html());var notifications_all=unescape($j("<div>").append($j("#nav-notifications-see-all").clone()).html());var notifications_mark=unescape($j("<div>").append($j("#nav-notifications-mark-all").clone()).html());var notifications_empty=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,data){var invalid=$j(data).find("invalid").text();if(invalid==1){window.location.href=window.location.href}var net=$j(data).find("net").text();if(net==0){net="";$j("#net-update").removeClass("show")}else{$j("#net-update").addClass("show")}$j("#net-update").html(net);var home=$j(data).find("home").text();if(home==0){home="";$j("#home-update").removeClass("show")}else{$j("#home-update").addClass("show")}$j("#home-update").html(home);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update").removeClass("show")}else{$j("#intro-update").addClass("show")}$j("#intro-update").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update").removeClass("show")}else{$j("#mail-update").addClass("show")}$j("#mail-update").html(mail);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update-li").removeClass("show")}else{$j("#intro-update-li").addClass("show")}$j("#intro-update-li").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update-li").removeClass("show")}else{$j("#mail-update-li").addClass("show")}$j("#mail-update-li").html(mail);var eNotif=$j(data).find("notif");if(eNotif.children("note").length==0){$j("#nav-notifications-menu").html(notifications_empty)}else{nnm=$j("#nav-notifications-menu");nnm.html(notifications_all+notifications_mark);eNotif.children("note").each(function(){e=$j(this);text=e.text().format("<span class='contactname'>"+e.attr("name")+"</span>");html=notifications_tpl.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen"));nnm.append(html)});$j("img[data-src]",nnm).each(function(i,el){$j(el).attr("src",$j(el).data("src"))})}notif=eNotif.attr("count");if(notif>0){$j("#nav-notifications-linkmenu").addClass("on")}else{$j("#nav-notifications-linkmenu").removeClass("on")}if(notif==0){notif="";$j("#notify-update").removeClass("show")}else{$j("#notify-update").addClass("show")}$j("#notify-update").html(notif);var eSysmsg=$j(data).find("sysmsgs");eSysmsg.children("notice").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"notice",life:1e3})});eSysmsg.children("info").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"info",life:1e3})})});NavUpdate()});function NavUpdate(){if(!stopped){var pingCmd="ping"+(localUser!=0?"?f=&uid="+localUser:"");$j.get(pingCmd,function(data){$j(data).find("result").each(function(){$j("nav").trigger("nav-update",this);if($j("#live-network").length){src="network";liveUpdate()}if($j("#live-profile").length){src="profile";liveUpdate()}if($j("#live-community").length){src="community";liveUpdate()}if($j("#live-notes").length){src="notes";liveUpdate()}if($j("#live-display").length){src="display";liveUpdate()}if($j("#live-photos").length){if(liking){liking=0;window.location.href=window.location.href}}})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$j(".like-rotator").hide();return}if($j(".comment-edit-text-full").length||in_progress){if(livetime){clearTimeout(livetime)}livetime=setTimeout(liveUpdate,1e4);return}if(livetime!=null)livetime=null;prev="live-"+src;in_progress=true;var udargs=netargs.length?"/"+netargs:"";var update_url="update_"+src+udargs+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$j.get(update_url,function(data){in_progress=false;$j(".toplevel_item",data).each(function(){var ident=$j(this).attr("id");if($j("#"+ident).length==0&&profile_page==1){$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("#"+prev).after($j(this))}else{var id=$j(".hide-comments-total",this).attr("id");if(typeof id!="undefined"){id=id.split("-")[3];var commentsOpen=$j("#collapsed-comments-"+id).is(":visible")}$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("html").height($j("html").height());$j("#"+ident).replaceWith($j(this));if(typeof id!="undefined"){if(commentsOpen)showHideComments(id)}$j("html").height("auto")}prev=ident});collapseHeight();$j(".like-rotator").hide();if(commentBusy){commentBusy=false;$j("body").css("cursor","auto")}$j(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl")})}function collapseHeight(elems){var elemName=".wall-item-body:not(.divmore)";if(typeof elems!="undefined"){elemName=elems+" "+elemName}$j(elemName).each(function(){if($j(this).height()>350){$j("html").height($j("html").height());$j(this).divgrow({initialHeight:300,showBrackets:false,speed:0});$j(this).addClass("divmore");$j("html").height("auto")}})}function imgbright(node){$j(node).removeClass("drophide").addClass("drop")}function imgdull(node){$j(node).removeClass("drop").addClass("drophide")}function dolike(ident,verb){unpause();$j("#like-rotator-"+ident.toString()).show();$j.get("like/"+ident.toString()+"?verb="+verb,NavUpdate);liking=1}function dostar(ident){ident=ident.toString();$j.get("starred/"+ident,function(data){if(data.match(/1/)){$j("#starred-"+ident).addClass("starred");$j("#starred-"+ident).removeClass("unstarred");$j("#star-"+ident).addClass("hidden");$j("#unstar-"+ident).removeClass("hidden")}else{$j("#starred-"+ident).addClass("unstarred");$j("#starred-"+ident).removeClass("starred");$j("#star-"+ident).removeClass("hidden");$j("#unstar-"+ident).addClass("hidden")}})}function getPosition(e){var cursor={x:0,y:0};if(e.touches[0].pageX||e.touches[0].pageY){cursor.x=e.touches[0].pageX;cursor.y=e.touches[0].pageY}else{if(e.touches[0].clientX||e.touches[0].clientY){cursor.x=e.touches[0].clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft;cursor.y=e.touches[0].clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop}else{if(e.touches[0].x||e.touches[0].y){cursor.touches[0].x=e.touches[0].x;cursor.touches[0].y=e.touches[0].y}}}return cursor}var lockvisible=false;function lockview(event,id){event=event||window.event;cursor=getPosition(event);if(lockvisible){lockviewhide()}else{lockvisible=true;$j.get("lockview/"+id,function(data){$j("#panel").html(data);$j("#panel").css({left:cursor.x+5,top:cursor.y+5});$j("#panel").show()})}}function lockviewhide(){lockvisible=false;$j("#panel").hide()}function post_comment(id){unpause();commentBusy=true;$j("body").css("cursor","wait");$j("#comment-preview-inp-"+id).val("0");$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.success){$j("#comment-edit-wrapper-"+id).hide();$j("#comment-edit-text-"+id).val("");var tarea=document.getElementById("comment-edit-text-"+id);if(tarea)commentClose(tarea,id);if(timer)clearTimeout(timer);timer=setTimeout(NavUpdate,10)}if(data.reload){window.location.href=data.reload}},"json");return false}function preview_comment(id){$j("#comment-preview-inp-"+id).val("1");$j("#comment-edit-preview-"+id).show();$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.preview){$j("#comment-edit-preview-"+id).html(data.preview);$j("#comment-edit-preview-"+id+" a").click(function(){return false})}},"json");return true}function showHideComments(id){if($j("#collapsed-comments-"+id).is(":visible")){$j("#collapsed-comments-"+id).hide();$j("#hide-comments-"+id).html(window.showMore)}else{$j("#collapsed-comments-"+id).show();$j("#hide-comments-"+id).html(window.showFewer);collapseHeight("#collapsed-comments-"+id)}}function preview_post(){$j("#jot-preview").val("1");$j("#jot-preview-content").show();tinyMCE.triggerSave();$j.post("item",$j("#profile-jot-form").serialize(),function(data){if(data.preview){$j("#jot-preview-content").html(data.preview);$j("#jot-preview-content"+" a").click(function(){return false})}},"json");$j("#jot-preview").val("0");return true}function unpause(){totStopped=false;stopped=false;$j("#pause").html("")}function bin2hex(s){var v,i,f=0,a=[];s+="";f=s.length;for(i=0;i<f;i++){a[i]=s.charCodeAt(i).toString(16).replace(/^([\da-f])$/,"0$1")}return a.join("")}function groupChangeMember(gid,cid,sec_token){$j("body .fakelink").css("cursor","wait");$j.get("group/"+gid+"/"+cid+"?t="+sec_token,function(data){$j("#group-update-wrapper").html(data);$j("body .fakelink").css("cursor","auto")})}function profChangeMember(gid,cid){$j("body .fakelink").css("cursor","wait");$j.get("profperm/"+gid+"/"+cid,function(data){$j("#prof-update-wrapper").html(data);$j("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(gid,cid){$j("body").css("cursor","wait");$j.get("contactgroup/"+gid+"/"+cid,function(data){$j("body").css("cursor","auto")})}function checkboxhighlight(box){if($j(box).is(":checked")){$j(box).addClass("checkeditem")}else{$j(box).removeClass("checkeditem")}}function notifyMarkAll(){$j.get("notify/mark/all",function(data){if(timer)clearTimeout(timer);timer=setTimeout(NavUpdate,1e3)})}function fcFileBrowser(field_name,url,type,win){var cmsURL=baseurl+"/fbrowser/"+type+"/";tinyMCE.activeEditor.windowManager.open({file:cmsURL,title:"File Browser",width:420,height:400,resizable:"yes",inline:"yes",close_previous:"no"},{window:win,input:field_name});return false}function setupFieldRichtext(){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:"fieldRichtext",plugins:"bbcode,paste, inlinepopups",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,force_p_newlines:false,force_br_newlines:true,forced_root_block:"",convert_urls:false,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:false,file_browser_callback:"fcFileBrowser"})}String.prototype.format=function(){var formatted=this;for(var i=0;i<arguments.length;i++){var regexp=new RegExp("\\{"+i+"\\}","gi");formatted=formatted.replace(regexp,arguments[i])}return formatted};Array.prototype.remove=function(item){to=undefined;from=this.indexOf(item);var rest=this.slice((to||from)+1||this.length);this.length=from<0?this.length+from:from;return this.push.apply(this,rest)};function previewTheme(elm){theme=$j(elm).val();$j.getJSON("pretheme?f=&theme="+theme,function(data){$j("#theme-preview").html('<div id="theme-desc">'+data.desc+'</div><div id="theme-version">'+data.version+'</div><div id="theme-credits">'+data.credits+"</div>")})}
\ No newline at end of file
diff --git a/view/theme/frost-mobile/register.tpl b/view/theme/frost-mobile/register.tpl
index cbc58a7846..041be5e96e 100644
--- a/view/theme/frost-mobile/register.tpl
+++ b/view/theme/frost-mobile/register.tpl
@@ -11,10 +11,12 @@
 	<p id="register-realpeople">$realpeople</p>
 
 	<br />
-	<div id="register-openid-wrapper"  class="field input" >
-			$oidhtml
+{{ if $oidlabel }}
+	<div id="register-openid-wrapper" >
+    	<label for="register-openid" id="label-register-openid" >$oidlabel</label><input 	type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="$openid" >
 	</div>
 	<div id="register-openid-end" ></div>
+{{ endif }}
 
 	<div class="register-explain-wrapper">
 	<p id="register-fill-desc">$fillwith $fillext</p>
diff --git a/view/theme/frost-mobile/smarty3/acl_selector.tpl b/view/theme/frost-mobile/smarty3/acl_selector.tpl
index f3b1abea7c..d18776e367 100644
--- a/view/theme/frost-mobile/smarty3/acl_selector.tpl
+++ b/view/theme/frost-mobile/smarty3/acl_selector.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="acl-wrapper">
 	<input id="acl-search">
 	<a href="#" id="acl-showall">{{$showall}}</a>
diff --git a/view/theme/frost-mobile/smarty3/admin_aside.tpl b/view/theme/frost-mobile/smarty3/admin_aside.tpl
index f60a22a99a..024d6195b5 100644
--- a/view/theme/frost-mobile/smarty3/admin_aside.tpl
+++ b/view/theme/frost-mobile/smarty3/admin_aside.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h4><a href="{{$admurl}}">{{$admtxt}}</a></h4>
 <ul class='admin linklist'>
diff --git a/view/theme/frost-mobile/smarty3/admin_site.tpl b/view/theme/frost-mobile/smarty3/admin_site.tpl
index 421f7e56c7..27773da2c4 100644
--- a/view/theme/frost-mobile/smarty3/admin_site.tpl
+++ b/view/theme/frost-mobile/smarty3/admin_site.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
diff --git a/view/theme/frost-mobile/smarty3/admin_users.tpl b/view/theme/frost-mobile/smarty3/admin_users.tpl
index d7a7ef2ca0..9d74a5e77e 100644
--- a/view/theme/frost-mobile/smarty3/admin_users.tpl
+++ b/view/theme/frost-mobile/smarty3/admin_users.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script>
 	function confirm_delete(uname){
 		return confirm( "{{$confirm_delete}}".format(uname));
diff --git a/view/theme/frost-mobile/smarty3/comment_item.tpl b/view/theme/frost-mobile/smarty3/comment_item.tpl
index 0c987dbe37..a5baa14a3d 100644
--- a/view/theme/frost-mobile/smarty3/comment_item.tpl
+++ b/view/theme/frost-mobile/smarty3/comment_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!--		<script>
 		$(document).ready( function () {
 			$(document).mouseup(function(e) {
diff --git a/view/theme/frost-mobile/smarty3/contact_edit.tpl b/view/theme/frost-mobile/smarty3/contact_edit.tpl
index d5ade11bc0..516fe02ca7 100644
--- a/view/theme/frost-mobile/smarty3/contact_edit.tpl
+++ b/view/theme/frost-mobile/smarty3/contact_edit.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h2>{{$header}}</h2>
 
diff --git a/view/theme/frost-mobile/smarty3/contact_head.tpl b/view/theme/frost-mobile/smarty3/contact_head.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/theme/frost-mobile/smarty3/contact_head.tpl
+++ b/view/theme/frost-mobile/smarty3/contact_head.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/theme/frost-mobile/smarty3/contact_template.tpl b/view/theme/frost-mobile/smarty3/contact_template.tpl
index 91b5bae66f..2f903f494d 100644
--- a/view/theme/frost-mobile/smarty3/contact_template.tpl
+++ b/view/theme/frost-mobile/smarty3/contact_template.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" >
 	<div class="contact-entry-photo-wrapper" >
diff --git a/view/theme/frost-mobile/smarty3/contacts-end.tpl b/view/theme/frost-mobile/smarty3/contacts-end.tpl
index bf19b00c0e..9298a4245c 100644
--- a/view/theme/frost-mobile/smarty3/contacts-end.tpl
+++ b/view/theme/frost-mobile/smarty3/contacts-end.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script src="{{$baseurl}}/library/jquery_ac/friendica.complete.min.js" ></script>
 
diff --git a/view/theme/frost-mobile/smarty3/contacts-head.tpl b/view/theme/frost-mobile/smarty3/contacts-head.tpl
index 5ae97f9f0c..dd66b71d3e 100644
--- a/view/theme/frost-mobile/smarty3/contacts-head.tpl
+++ b/view/theme/frost-mobile/smarty3/contacts-head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script>
 	window.autocompleteType = 'contacts-head';
diff --git a/view/theme/frost-mobile/smarty3/contacts-template.tpl b/view/theme/frost-mobile/smarty3/contacts-template.tpl
index 3a25475968..b9162c2e9e 100644
--- a/view/theme/frost-mobile/smarty3/contacts-template.tpl
+++ b/view/theme/frost-mobile/smarty3/contacts-template.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$header}}{{if $total}} ({{$total}}){{/if}}</h1>
 
 {{if $finding}}<h4>{{$finding}}</h4>{{/if}}
@@ -15,8 +20,8 @@
 
 
 <div id="contacts-display-wrapper">
-{{foreach $contacts as $c}}
-	{{include file="contact_template.tpl" contact=$c}}
+{{foreach $contacts as $contact}}
+	{{include file="contact_template.tpl"}}
 {{/foreach}}
 </div>
 <div id="contact-edit-end"></div>
diff --git a/view/theme/frost-mobile/smarty3/contacts-widget-sidebar.tpl b/view/theme/frost-mobile/smarty3/contacts-widget-sidebar.tpl
index c0b923e672..bda321896e 100644
--- a/view/theme/frost-mobile/smarty3/contacts-widget-sidebar.tpl
+++ b/view/theme/frost-mobile/smarty3/contacts-widget-sidebar.tpl
@@ -1,2 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$follow_widget}}
 
diff --git a/view/theme/frost-mobile/smarty3/conversation.tpl b/view/theme/frost-mobile/smarty3/conversation.tpl
index aa6bee0ea5..31cfb54d20 100644
--- a/view/theme/frost-mobile/smarty3/conversation.tpl
+++ b/view/theme/frost-mobile/smarty3/conversation.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$live_update}}
 
 {{foreach $threads as $thread}}
@@ -11,7 +16,7 @@
 		{{/if}}
 		{{if $item.comment_lastcollapsed}}</div>{{/if}}
 		
-		{{include file="file:{{$item.template}}"}}
+		{{include file="{{$item.template}}"}}
 		
 		
 	{{/foreach}}
diff --git a/view/theme/frost-mobile/smarty3/cropbody.tpl b/view/theme/frost-mobile/smarty3/cropbody.tpl
index 2678488e7d..5ace9a1aaf 100644
--- a/view/theme/frost-mobile/smarty3/cropbody.tpl
+++ b/view/theme/frost-mobile/smarty3/cropbody.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$title}}</h1>
 <p id="cropimage-desc">
 {{$desc}}
diff --git a/view/theme/frost-mobile/smarty3/cropend.tpl b/view/theme/frost-mobile/smarty3/cropend.tpl
index a56c71d92e..7a828815b9 100644
--- a/view/theme/frost-mobile/smarty3/cropend.tpl
+++ b/view/theme/frost-mobile/smarty3/cropend.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
       <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
       <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
       <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>
diff --git a/view/theme/frost-mobile/smarty3/crophead.tpl b/view/theme/frost-mobile/smarty3/crophead.tpl
index 56e941e3ab..6438cfb354 100644
--- a/view/theme/frost-mobile/smarty3/crophead.tpl
+++ b/view/theme/frost-mobile/smarty3/crophead.tpl
@@ -1 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
       <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />
diff --git a/view/theme/frost-mobile/smarty3/display-head.tpl b/view/theme/frost-mobile/smarty3/display-head.tpl
index 1fc82ae779..17d17dd7db 100644
--- a/view/theme/frost-mobile/smarty3/display-head.tpl
+++ b/view/theme/frost-mobile/smarty3/display-head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script>
 	window.autoCompleteType = 'display-head';
 </script>
diff --git a/view/theme/frost-mobile/smarty3/end.tpl b/view/theme/frost-mobile/smarty3/end.tpl
index 1c2f81f62a..6f0da0918e 100644
--- a/view/theme/frost-mobile/smarty3/end.tpl
+++ b/view/theme/frost-mobile/smarty3/end.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!--[if IE]>
 <script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 <![endif]-->
diff --git a/view/theme/frost-mobile/smarty3/event_end.tpl b/view/theme/frost-mobile/smarty3/event_end.tpl
index 40c64ea14c..c275be9236 100644
--- a/view/theme/frost-mobile/smarty3/event_end.tpl
+++ b/view/theme/frost-mobile/smarty3/event_end.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script language="javascript" type="text/javascript"
           src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
 
diff --git a/view/theme/frost-mobile/smarty3/event_head.tpl b/view/theme/frost-mobile/smarty3/event_head.tpl
index a1e8789294..9d1c4b5f94 100644
--- a/view/theme/frost-mobile/smarty3/event_head.tpl
+++ b/view/theme/frost-mobile/smarty3/event_head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <link rel='stylesheet' type='text/css' href='{{$baseurl}}/library/fullcalendar/fullcalendar.css' />
 
 <script language="javascript" type="text/javascript">
diff --git a/view/theme/frost-mobile/smarty3/field_checkbox.tpl b/view/theme/frost-mobile/smarty3/field_checkbox.tpl
index eaf4c8a0d0..f7f857f592 100644
--- a/view/theme/frost-mobile/smarty3/field_checkbox.tpl
+++ b/view/theme/frost-mobile/smarty3/field_checkbox.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field checkbox' id='div_id_{{$field.0}}'>
 		<label id='label_id_{{$field.0}}' for='id_{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/theme/frost-mobile/smarty3/field_input.tpl b/view/theme/frost-mobile/smarty3/field_input.tpl
index e2c519b916..240bed249f 100644
--- a/view/theme/frost-mobile/smarty3/field_input.tpl
+++ b/view/theme/frost-mobile/smarty3/field_input.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field input' id='wrapper_{{$field.0}}'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label><br />
diff --git a/view/theme/frost-mobile/smarty3/field_openid.tpl b/view/theme/frost-mobile/smarty3/field_openid.tpl
index 69319b0aaf..d5ebd9a3b6 100644
--- a/view/theme/frost-mobile/smarty3/field_openid.tpl
+++ b/view/theme/frost-mobile/smarty3/field_openid.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field input openid' id='wrapper_{{$field.0}}'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label><br />
diff --git a/view/theme/frost-mobile/smarty3/field_password.tpl b/view/theme/frost-mobile/smarty3/field_password.tpl
index 1b51d01515..f1352f27b2 100644
--- a/view/theme/frost-mobile/smarty3/field_password.tpl
+++ b/view/theme/frost-mobile/smarty3/field_password.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field password' id='wrapper_{{$field.0}}'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label><br />
diff --git a/view/theme/frost-mobile/smarty3/field_themeselect.tpl b/view/theme/frost-mobile/smarty3/field_themeselect.tpl
index f1cd7935b1..0d4552c3bf 100644
--- a/view/theme/frost-mobile/smarty3/field_themeselect.tpl
+++ b/view/theme/frost-mobile/smarty3/field_themeselect.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 	<div class='field select'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/theme/frost-mobile/smarty3/generic_links_widget.tpl b/view/theme/frost-mobile/smarty3/generic_links_widget.tpl
index e72ae478c1..6c9700764a 100644
--- a/view/theme/frost-mobile/smarty3/generic_links_widget.tpl
+++ b/view/theme/frost-mobile/smarty3/generic_links_widget.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="widget{{if $class}} {{$class}}{{/if}}">
 <!--	{{if $title}}<h3>{{$title}}</h3>{{/if}}-->
 	{{if $desc}}<div class="desc">{{$desc}}</div>{{/if}}
diff --git a/view/theme/frost-mobile/smarty3/head.tpl b/view/theme/frost-mobile/smarty3/head.tpl
index 3ebf11e4fc..4ab78e2eb1 100644
--- a/view/theme/frost-mobile/smarty3/head.tpl
+++ b/view/theme/frost-mobile/smarty3/head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <!--<meta content='width=device-width, minimum-scale=1 maximum-scale=1' name='viewport'>
 <meta content='True' name='HandheldFriendly'>
diff --git a/view/theme/frost-mobile/smarty3/jot-end.tpl b/view/theme/frost-mobile/smarty3/jot-end.tpl
index 079481a63e..055ecc5e61 100644
--- a/view/theme/frost-mobile/smarty3/jot-end.tpl
+++ b/view/theme/frost-mobile/smarty3/jot-end.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.min.js" ></script>
 
diff --git a/view/theme/frost-mobile/smarty3/jot-header.tpl b/view/theme/frost-mobile/smarty3/jot-header.tpl
index 08fae23d3d..d792ec1a18 100644
--- a/view/theme/frost-mobile/smarty3/jot-header.tpl
+++ b/view/theme/frost-mobile/smarty3/jot-header.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script>
 	var none = "none"; // ugly hack: {{$editselect}} shouldn't be a string if TinyMCE is enabled, but should if it isn't
diff --git a/view/theme/frost-mobile/smarty3/jot.tpl b/view/theme/frost-mobile/smarty3/jot.tpl
index 98dd7b3a9f..40c4107174 100644
--- a/view/theme/frost-mobile/smarty3/jot.tpl
+++ b/view/theme/frost-mobile/smarty3/jot.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div id="profile-jot-wrapper" >
 	<div id="profile-jot-banner-wrapper">
diff --git a/view/theme/frost-mobile/smarty3/jot_geotag.tpl b/view/theme/frost-mobile/smarty3/jot_geotag.tpl
index 3f8bee91a7..d828980e58 100644
--- a/view/theme/frost-mobile/smarty3/jot_geotag.tpl
+++ b/view/theme/frost-mobile/smarty3/jot_geotag.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 	if(navigator.geolocation) {
 		navigator.geolocation.getCurrentPosition(function(position) {
diff --git a/view/theme/frost-mobile/smarty3/lang_selector.tpl b/view/theme/frost-mobile/smarty3/lang_selector.tpl
index 945cbf51e3..a1aee8277f 100644
--- a/view/theme/frost-mobile/smarty3/lang_selector.tpl
+++ b/view/theme/frost-mobile/smarty3/lang_selector.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="lang-select-icon" class="icon s22 language" title="{{$title}}" onclick="openClose('language-selector');" ></div>
 <div id="language-selector" style="display: none;" >
 	<form action="#" method="post" >
diff --git a/view/theme/frost-mobile/smarty3/login.tpl b/view/theme/frost-mobile/smarty3/login.tpl
index 2f466dddd0..a361f3e271 100644
--- a/view/theme/frost-mobile/smarty3/login.tpl
+++ b/view/theme/frost-mobile/smarty3/login.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="login-form">
 <form action="{{$dest_url}}" method="post" >
diff --git a/view/theme/frost-mobile/smarty3/login_head.tpl b/view/theme/frost-mobile/smarty3/login_head.tpl
index 9e5320e885..86805c61f9 100644
--- a/view/theme/frost-mobile/smarty3/login_head.tpl
+++ b/view/theme/frost-mobile/smarty3/login_head.tpl
@@ -1,2 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!--<link rel="stylesheet" href="{{$baseurl}}/view/theme/frost-mobile/login-style.css" type="text/css" media="all" />-->
 
diff --git a/view/theme/frost-mobile/smarty3/lostpass.tpl b/view/theme/frost-mobile/smarty3/lostpass.tpl
index 4072478482..5a22c245bf 100644
--- a/view/theme/frost-mobile/smarty3/lostpass.tpl
+++ b/view/theme/frost-mobile/smarty3/lostpass.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="lostpass-form">
 <h2>{{$title}}</h2>
 <br /><br /><br />
diff --git a/view/theme/frost-mobile/smarty3/mail_conv.tpl b/view/theme/frost-mobile/smarty3/mail_conv.tpl
index bd72f4efd0..0e58de8f74 100644
--- a/view/theme/frost-mobile/smarty3/mail_conv.tpl
+++ b/view/theme/frost-mobile/smarty3/mail_conv.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="mail-conv-outside-wrapper">
 	<div class="mail-conv-sender" >
 		<a href="{{$mail.from_url}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name}}" /></a>
diff --git a/view/theme/frost-mobile/smarty3/message-end.tpl b/view/theme/frost-mobile/smarty3/message-end.tpl
index bf19b00c0e..9298a4245c 100644
--- a/view/theme/frost-mobile/smarty3/message-end.tpl
+++ b/view/theme/frost-mobile/smarty3/message-end.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script src="{{$baseurl}}/library/jquery_ac/friendica.complete.min.js" ></script>
 
diff --git a/view/theme/frost-mobile/smarty3/message-head.tpl b/view/theme/frost-mobile/smarty3/message-head.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/theme/frost-mobile/smarty3/message-head.tpl
+++ b/view/theme/frost-mobile/smarty3/message-head.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/theme/frost-mobile/smarty3/moderated_comment.tpl b/view/theme/frost-mobile/smarty3/moderated_comment.tpl
index 8fbdf4bc4b..b2401ca483 100644
--- a/view/theme/frost-mobile/smarty3/moderated_comment.tpl
+++ b/view/theme/frost-mobile/smarty3/moderated_comment.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
 			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
 				<input type="hidden" name="type" value="{{$type}}" />
diff --git a/view/theme/frost-mobile/smarty3/msg-header.tpl b/view/theme/frost-mobile/smarty3/msg-header.tpl
index 5b3418f09c..977f571d15 100644
--- a/view/theme/frost-mobile/smarty3/msg-header.tpl
+++ b/view/theme/frost-mobile/smarty3/msg-header.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script language="javascript" type="text/javascript">
 	window.nickname = "{{$nickname}}";
diff --git a/view/theme/frost-mobile/smarty3/nav.tpl b/view/theme/frost-mobile/smarty3/nav.tpl
index fb5d6223bd..d570c9f265 100644
--- a/view/theme/frost-mobile/smarty3/nav.tpl
+++ b/view/theme/frost-mobile/smarty3/nav.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <nav>
 <!--	{{$langselector}} -->
 
diff --git a/view/theme/frost-mobile/smarty3/photo_edit.tpl b/view/theme/frost-mobile/smarty3/photo_edit.tpl
index 420d57c5e2..a6668c9f11 100644
--- a/view/theme/frost-mobile/smarty3/photo_edit.tpl
+++ b/view/theme/frost-mobile/smarty3/photo_edit.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <form action="photos/{{$nickname}}/{{$resource_id}}" method="post" id="photo_edit_form" >
 
diff --git a/view/theme/frost-mobile/smarty3/photo_edit_head.tpl b/view/theme/frost-mobile/smarty3/photo_edit_head.tpl
index 5d91e1169b..857e6e63ac 100644
--- a/view/theme/frost-mobile/smarty3/photo_edit_head.tpl
+++ b/view/theme/frost-mobile/smarty3/photo_edit_head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script>
 	window.prevLink = "{{$prevlink}}";
diff --git a/view/theme/frost-mobile/smarty3/photo_view.tpl b/view/theme/frost-mobile/smarty3/photo_view.tpl
index b2d637a962..354fb9c28b 100644
--- a/view/theme/frost-mobile/smarty3/photo_view.tpl
+++ b/view/theme/frost-mobile/smarty3/photo_view.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="live-display"></div>
 <h3><a href="{{$album.0}}">{{$album.1}}</a></h3>
 
diff --git a/view/theme/frost-mobile/smarty3/photos_head.tpl b/view/theme/frost-mobile/smarty3/photos_head.tpl
index f733d622f0..5d7e0152da 100644
--- a/view/theme/frost-mobile/smarty3/photos_head.tpl
+++ b/view/theme/frost-mobile/smarty3/photos_head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script>
 	window.isPublic = "{{$ispublic}}";
diff --git a/view/theme/frost-mobile/smarty3/photos_upload.tpl b/view/theme/frost-mobile/smarty3/photos_upload.tpl
index 2017ae784c..0c4a26077b 100644
--- a/view/theme/frost-mobile/smarty3/photos_upload.tpl
+++ b/view/theme/frost-mobile/smarty3/photos_upload.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h3>{{$pagename}}</h3>
 
 <div id="photos-usage-message">{{$usage}}</div>
diff --git a/view/theme/frost-mobile/smarty3/profed_end.tpl b/view/theme/frost-mobile/smarty3/profed_end.tpl
index 261e23dd2c..048c52c44d 100644
--- a/view/theme/frost-mobile/smarty3/profed_end.tpl
+++ b/view/theme/frost-mobile/smarty3/profed_end.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script type="text/javascript" src="js/country.min.js" ></script>
 
diff --git a/view/theme/frost-mobile/smarty3/profed_head.tpl b/view/theme/frost-mobile/smarty3/profed_head.tpl
index 83d22d1745..e4fef64d63 100644
--- a/view/theme/frost-mobile/smarty3/profed_head.tpl
+++ b/view/theme/frost-mobile/smarty3/profed_head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script language="javascript" type="text/javascript">
 	window.editSelect = "none";
diff --git a/view/theme/frost-mobile/smarty3/profile_edit.tpl b/view/theme/frost-mobile/smarty3/profile_edit.tpl
index 15127ac943..2a38795d66 100644
--- a/view/theme/frost-mobile/smarty3/profile_edit.tpl
+++ b/view/theme/frost-mobile/smarty3/profile_edit.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$default}}
 
 <h1>{{$banner}}</h1>
diff --git a/view/theme/frost-mobile/smarty3/profile_photo.tpl b/view/theme/frost-mobile/smarty3/profile_photo.tpl
index 269102c13a..6bcb3cf850 100644
--- a/view/theme/frost-mobile/smarty3/profile_photo.tpl
+++ b/view/theme/frost-mobile/smarty3/profile_photo.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$title}}</h1>
 
 <form enctype="multipart/form-data" action="profile_photo" method="post">
diff --git a/view/theme/frost-mobile/smarty3/profile_vcard.tpl b/view/theme/frost-mobile/smarty3/profile_vcard.tpl
index 91630b0ec3..85c6345d6d 100644
--- a/view/theme/frost-mobile/smarty3/profile_vcard.tpl
+++ b/view/theme/frost-mobile/smarty3/profile_vcard.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="vcard">
 
 	<div class="fn label">{{$profile.name}}</div>
diff --git a/view/theme/frost-mobile/smarty3/prv_message.tpl b/view/theme/frost-mobile/smarty3/prv_message.tpl
index 71667af2da..17699414e7 100644
--- a/view/theme/frost-mobile/smarty3/prv_message.tpl
+++ b/view/theme/frost-mobile/smarty3/prv_message.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h3>{{$header}}</h3>
 
diff --git a/view/theme/frost-mobile/smarty3/register.tpl b/view/theme/frost-mobile/smarty3/register.tpl
index 62b147a8ee..3cd6dbda13 100644
--- a/view/theme/frost-mobile/smarty3/register.tpl
+++ b/view/theme/frost-mobile/smarty3/register.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class='register-form'>
 <h2>{{$regtitle}}</h2>
 <br />
@@ -11,10 +16,12 @@
 	<p id="register-realpeople">{{$realpeople}}</p>
 
 	<br />
-	<div id="register-openid-wrapper"  class="field input" >
-			{{$oidhtml}}
+{{if $oidlabel}}
+	<div id="register-openid-wrapper" >
+    	<label for="register-openid" id="label-register-openid" >{{$oidlabel}}</label><input 	type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="{{$openid}}" >
 	</div>
 	<div id="register-openid-end" ></div>
+{{/if}}
 
 	<div class="register-explain-wrapper">
 	<p id="register-fill-desc">{{$fillwith}} {{$fillext}}</p>
diff --git a/view/theme/frost-mobile/smarty3/settings-head.tpl b/view/theme/frost-mobile/smarty3/settings-head.tpl
index f733d622f0..5d7e0152da 100644
--- a/view/theme/frost-mobile/smarty3/settings-head.tpl
+++ b/view/theme/frost-mobile/smarty3/settings-head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script>
 	window.isPublic = "{{$ispublic}}";
diff --git a/view/theme/frost-mobile/smarty3/settings.tpl b/view/theme/frost-mobile/smarty3/settings.tpl
index 1f6eaa5a9a..8724a12443 100644
--- a/view/theme/frost-mobile/smarty3/settings.tpl
+++ b/view/theme/frost-mobile/smarty3/settings.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$ptitle}}</h1>
 
 {{$nickname_block}}
diff --git a/view/theme/frost-mobile/smarty3/settings_display_end.tpl b/view/theme/frost-mobile/smarty3/settings_display_end.tpl
index 894e447c61..4b3db00f5a 100644
--- a/view/theme/frost-mobile/smarty3/settings_display_end.tpl
+++ b/view/theme/frost-mobile/smarty3/settings_display_end.tpl
@@ -1,2 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	<script>$j(function(){ previewTheme($j("#id_{{$theme.0}}")[0]); });</script>
 
diff --git a/view/theme/frost-mobile/smarty3/threaded_conversation.tpl b/view/theme/frost-mobile/smarty3/threaded_conversation.tpl
index 0c96b30e3e..801d3e179e 100644
--- a/view/theme/frost-mobile/smarty3/threaded_conversation.tpl
+++ b/view/theme/frost-mobile/smarty3/threaded_conversation.tpl
@@ -1,7 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$live_update}}
 
 {{foreach $threads as $thread}}
-{{include file="file:{{$thread.template}}" item=$thread}}
+{{include file="{{$thread.template}}" item=$thread}}
 {{/foreach}}
 
 <div id="conversation-end"></div>
diff --git a/view/theme/frost-mobile/smarty3/voting_fakelink.tpl b/view/theme/frost-mobile/smarty3/voting_fakelink.tpl
index 44e7d37a28..1e073916e1 100644
--- a/view/theme/frost-mobile/smarty3/voting_fakelink.tpl
+++ b/view/theme/frost-mobile/smarty3/voting_fakelink.tpl
@@ -1,2 +1,6 @@
-		<span class="fakelink-wrapper" id={{$vote_id}}-wrapper><span class="fakelink" onclick="openClose('{{$vote_id}}');">{{$count}} {{$people}}</span> {{$vote_mood}}</span>
-
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<span class="fakelink-wrapper"  id="{{$type}}list-{{$id}}-wrapper">{{$phrase}}</span>
diff --git a/view/theme/frost-mobile/smarty3/wall_thread.tpl b/view/theme/frost-mobile/smarty3/wall_thread.tpl
index e1a0aa868e..1bbaf4420e 100644
--- a/view/theme/frost-mobile/smarty3/wall_thread.tpl
+++ b/view/theme/frost-mobile/smarty3/wall_thread.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $item.comment_firstcollapsed}}
 	<div class="hide-comments-outer">
 	<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
@@ -113,7 +118,7 @@
 <!--<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>-->
 <!--</div>-->
 {{foreach $item.children as $child}}
-	{{include file="file:{{$child.template}}" item=$child}}
+	{{include file="{{$child.template}}" item=$child}}
 {{/foreach}}
 
 {{if $item.flatten}}
diff --git a/view/theme/frost-mobile/smarty3/wallmsg-end.tpl b/view/theme/frost-mobile/smarty3/wallmsg-end.tpl
index d9e34d6fba..a0da3e095b 100644
--- a/view/theme/frost-mobile/smarty3/wallmsg-end.tpl
+++ b/view/theme/frost-mobile/smarty3/wallmsg-end.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script language="javascript" type="text/javascript">
 wallInitEditor();
diff --git a/view/theme/frost-mobile/smarty3/wallmsg-header.tpl b/view/theme/frost-mobile/smarty3/wallmsg-header.tpl
index fc95f4d6c8..1d6cb69a1d 100644
--- a/view/theme/frost-mobile/smarty3/wallmsg-header.tpl
+++ b/view/theme/frost-mobile/smarty3/wallmsg-header.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script language="javascript" type="text/javascript">
 window.editSelect = "none";
diff --git a/view/theme/frost-mobile/voting_fakelink.tpl b/view/theme/frost-mobile/voting_fakelink.tpl
index c342046970..b66302cc27 100644
--- a/view/theme/frost-mobile/voting_fakelink.tpl
+++ b/view/theme/frost-mobile/voting_fakelink.tpl
@@ -1,2 +1 @@
-		<span class="fakelink-wrapper" id=$vote_id-wrapper><span class="fakelink" onclick="openClose('$vote_id');">$count $people</span> $vote_mood</span>
-
+<span class="fakelink-wrapper"  id="$[type]list-$id-wrapper">$phrase</span>
diff --git a/view/theme/frost/acl_selector.tpl b/view/theme/frost/acl_selector.tpl
index e79a6891a5..df34a1a2ae 100644
--- a/view/theme/frost/acl_selector.tpl
+++ b/view/theme/frost/acl_selector.tpl
@@ -9,6 +9,7 @@
 </div>
 
 <div class="acl-list-item" rel="acl-template" style="display:none">
+	<img data-src="{0}"><p>{1}</p>
 	<a href="#" class='acl-button-show'>$show</a>
 	<a href="#" class='acl-button-hide'>$hide</a>
 </div>
diff --git a/view/theme/frost/contacts-template.tpl b/view/theme/frost/contacts-template.tpl
index 326c9d7892..de89b5371e 100644
--- a/view/theme/frost/contacts-template.tpl
+++ b/view/theme/frost/contacts-template.tpl
@@ -15,8 +15,8 @@ $tabs
 
 
 <div id="contacts-display-wrapper">
-{{ for $contacts as $c }}
-	{{ inc contact_template.tpl with $contact=$c }}{{ endinc }}
+{{ for $contacts as $contact }}
+	{{ inc contact_template.tpl }}{{ endinc }}
 {{ endfor }}
 </div>
 <div id="contact-edit-end"></div>
diff --git a/view/theme/frost/js/acl.js b/view/theme/frost/js/acl.js
index 6b443b2481..511f84f784 100644
--- a/view/theme/frost/js/acl.js
+++ b/view/theme/frost/js/acl.js
@@ -253,10 +253,9 @@ ACL.prototype.populate = function(data){
 		//console.log(html);
 		that.list_content.append(html);
 	});
-	$(".acl-list-item img[data-src]").each(function(i, el){
-		// Replace data-src attribute with src attribute for every image
-		$(el).attr('src', $(el).data("src"));
-		$(el).removeAttr("data-src");
+	$j(".acl-list-item img[data-src]", that.list_content).each(function(i, el){
+		// Add src attribute for images with a data-src attribute
+		$j(el).attr('src', $j(el).data("src"));
 	});
 	that.update_view();
 }
diff --git a/view/theme/frost/js/acl.min.js b/view/theme/frost/js/acl.min.js
index fe69e51899..e365f6fee9 100644
--- a/view/theme/frost/js/acl.min.js
+++ b/view/theme/frost/js/acl.min.js
@@ -1 +1 @@
-function ACL(e,t){that=this,that.url=e,that.kp_timer=null,t==undefined&&(t=[]),that.allow_cid=t[0]||[],that.allow_gid=t[1]||[],that.deny_cid=t[2]||[],that.deny_gid=t[3]||[],that.group_uids=[],that.nw=3,that.list_content=$j("#acl-list-content"),that.item_tpl=unescape($j(".acl-list-item[rel=acl-template]").html()),that.showall=$j("#acl-showall"),t.length==0&&that.showall.addClass("selected"),that.showall.click(that.on_showall),$j(".acl-button-show").live("click",that.on_button_show),$j(".acl-button-hide").live("click",that.on_button_hide),$j("#acl-search").keypress(that.on_search),$j("#acl-wrapper").parents("form").submit(that.on_submit),that.get(0,100)}ACL.prototype.on_submit=function(){aclfileds=$j("#acl-fields").html(""),$j(that.allow_gid).each(function(e,t){aclfileds.append("<input type='hidden' name='group_allow[]' value='"+t+"'>")}),$j(that.allow_cid).each(function(e,t){aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+t+"'>")}),$j(that.deny_gid).each(function(e,t){aclfileds.append("<input type='hidden' name='group_deny[]' value='"+t+"'>")}),$j(that.deny_cid).each(function(e,t){aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+t+"'>")})},ACL.prototype.search=function(){var e=$j("#acl-search").val();that.list_content.html(""),that.get(0,100,e)},ACL.prototype.on_search=function(e){that.kp_timer&&clearTimeout(that.kp_timer),that.kp_timer=setTimeout(that.search,1e3)},ACL.prototype.on_showall=function(e){return e.preventDefault(),e.stopPropagation(),that.showall.hasClass("selected")?!1:(that.showall.addClass("selected"),that.allow_cid=[],that.allow_gid=[],that.deny_cid=[],that.deny_gid=[],that.update_view(),!1)},ACL.prototype.on_button_show=function(e){return e.preventDefault(),e.stopImmediatePropagation(),e.stopPropagation(),that.set_allow($j(this).parent().attr("id")),!1},ACL.prototype.on_button_hide=function(e){return e.preventDefault(),e.stopImmediatePropagation(),e.stopPropagation(),that.set_deny($j(this).parent().attr("id")),!1},ACL.prototype.set_allow=function(e){type=e[0],id=parseInt(e.substr(1));switch(type){case"g":that.allow_gid.indexOf(id)<0?that.allow_gid.push(id):that.allow_gid.remove(id),that.deny_gid.indexOf(id)>=0&&that.deny_gid.remove(id);break;case"c":that.allow_cid.indexOf(id)<0?that.allow_cid.push(id):that.allow_cid.remove(id),that.deny_cid.indexOf(id)>=0&&that.deny_cid.remove(id)}that.update_view()},ACL.prototype.set_deny=function(e){type=e[0],id=parseInt(e.substr(1));switch(type){case"g":that.deny_gid.indexOf(id)<0?that.deny_gid.push(id):that.deny_gid.remove(id),that.allow_gid.indexOf(id)>=0&&that.allow_gid.remove(id);break;case"c":that.deny_cid.indexOf(id)<0?that.deny_cid.push(id):that.deny_cid.remove(id),that.allow_cid.indexOf(id)>=0&&that.allow_cid.remove(id)}that.update_view()},ACL.prototype.update_view=function(){that.allow_gid.length==0&&that.allow_cid.length==0&&that.deny_gid.length==0&&that.deny_cid.length==0?(that.showall.addClass("selected"),$j("#jot-perms-icon").removeClass("lock").addClass("unlock"),$j("#jot-public").show(),$j(".profile-jot-net input").attr("disabled",!1),typeof editor!="undefined"&&editor!=0&&$j("#profile-jot-desc").html(ispublic)):(that.showall.removeClass("selected"),$j("#jot-perms-icon").removeClass("unlock").addClass("lock"),$j("#jot-public").hide(),$j(".profile-jot-net input").attr("disabled","disabled"),$j("#profile-jot-desc").html("&nbsp;")),$j("#acl-list-content .acl-list-item").each(function(){$j(this).removeClass("groupshow grouphide")}),$j("#acl-list-content .acl-list-item").each(function(){itemid=$j(this).attr("id"),type=itemid[0],id=parseInt(itemid.substr(1)),btshow=$j(this).children(".acl-button-show").removeClass("selected"),bthide=$j(this).children(".acl-button-hide").removeClass("selected");switch(type){case"g":var e="";that.allow_gid.indexOf(id)>=0&&(btshow.addClass("selected"),bthide.removeClass("selected"),e="groupshow"),that.deny_gid.indexOf(id)>=0&&(btshow.removeClass("selected"),bthide.addClass("selected"),e="grouphide"),$j(that.group_uids[id]).each(function(t,n){e=="grouphide"&&$j("#c"+n).removeClass("groupshow");if(e!=""){var r=$j("#c"+n).attr("class");if(r==undefined)return!0;var i=r.indexOf("grouphide");i==-1&&$j("#c"+n).addClass(e)}});break;case"c":that.allow_cid.indexOf(id)>=0&&(btshow.addClass("selected"),bthide.removeClass("selected")),that.deny_cid.indexOf(id)>=0&&(btshow.removeClass("selected"),bthide.addClass("selected"))}})},ACL.prototype.get=function(e,t,n){var r={start:e,count:t,search:n};$j.ajax({type:"POST",url:that.url,data:r,dataType:"json",success:that.populate})},ACL.prototype.populate=function(e){var t=Math.ceil(e.tot/that.nw)*42;that.list_content.height(t),$j(e.items).each(function(){html="<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>",html=html.format(this.photo,this.name,this.type,this.id,"",this.network,this.link),this.uids!=undefined&&(that.group_uids[this.id]=this.uids),that.list_content.append(html)}),that.update_view()};
\ No newline at end of file
+function ACL(backend_url,preset){that=this;that.url=backend_url;that.kp_timer=null;if(preset==undefined)preset=[];that.allow_cid=preset[0]||[];that.allow_gid=preset[1]||[];that.deny_cid=preset[2]||[];that.deny_gid=preset[3]||[];that.group_uids=[];that.nw=3;that.list_content=$j("#acl-list-content");that.item_tpl=unescape($j(".acl-list-item[rel=acl-template]").html());that.showall=$j("#acl-showall");if(preset.length==0)that.showall.addClass("selected");that.showall.click(that.on_showall);$j(".acl-button-show").live("click",that.on_button_show);$j(".acl-button-hide").live("click",that.on_button_hide);$j("#acl-search").keypress(that.on_search);$j("#acl-wrapper").parents("form").submit(that.on_submit);that.get(0,100)}ACL.prototype.on_submit=function(){aclfileds=$j("#acl-fields").html("");$j(that.allow_gid).each(function(i,v){aclfileds.append("<input type='hidden' name='group_allow[]' value='"+v+"'>")});$j(that.allow_cid).each(function(i,v){aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+v+"'>")});$j(that.deny_gid).each(function(i,v){aclfileds.append("<input type='hidden' name='group_deny[]' value='"+v+"'>")});$j(that.deny_cid).each(function(i,v){aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>")})};ACL.prototype.search=function(){var srcstr=$j("#acl-search").val();that.list_content.html("");that.get(0,100,srcstr)};ACL.prototype.on_search=function(event){if(that.kp_timer)clearTimeout(that.kp_timer);that.kp_timer=setTimeout(that.search,1e3)};ACL.prototype.on_showall=function(event){event.preventDefault();event.stopPropagation();if(that.showall.hasClass("selected")){return false}that.showall.addClass("selected");that.allow_cid=[];that.allow_gid=[];that.deny_cid=[];that.deny_gid=[];that.update_view();return false};ACL.prototype.on_button_show=function(event){event.preventDefault();event.stopImmediatePropagation();event.stopPropagation();that.set_allow($j(this).parent().attr("id"));return false};ACL.prototype.on_button_hide=function(event){event.preventDefault();event.stopImmediatePropagation();event.stopPropagation();that.set_deny($j(this).parent().attr("id"));return false};ACL.prototype.set_allow=function(itemid){type=itemid[0];id=parseInt(itemid.substr(1));switch(type){case"g":if(that.allow_gid.indexOf(id)<0){that.allow_gid.push(id)}else{that.allow_gid.remove(id)}if(that.deny_gid.indexOf(id)>=0)that.deny_gid.remove(id);break;case"c":if(that.allow_cid.indexOf(id)<0){that.allow_cid.push(id)}else{that.allow_cid.remove(id)}if(that.deny_cid.indexOf(id)>=0)that.deny_cid.remove(id);break}that.update_view()};ACL.prototype.set_deny=function(itemid){type=itemid[0];id=parseInt(itemid.substr(1));switch(type){case"g":if(that.deny_gid.indexOf(id)<0){that.deny_gid.push(id)}else{that.deny_gid.remove(id)}if(that.allow_gid.indexOf(id)>=0)that.allow_gid.remove(id);break;case"c":if(that.deny_cid.indexOf(id)<0){that.deny_cid.push(id)}else{that.deny_cid.remove(id)}if(that.allow_cid.indexOf(id)>=0)that.allow_cid.remove(id);break}that.update_view()};ACL.prototype.update_view=function(){if(that.allow_gid.length==0&&that.allow_cid.length==0&&that.deny_gid.length==0&&that.deny_cid.length==0){that.showall.addClass("selected");$j("#jot-perms-icon").removeClass("lock").addClass("unlock");$j("#jot-public").show();$j(".profile-jot-net input").attr("disabled",false);if(typeof editor!="undefined"&&editor!=false){$j("#profile-jot-desc").html(ispublic)}}else{that.showall.removeClass("selected");$j("#jot-perms-icon").removeClass("unlock").addClass("lock");$j("#jot-public").hide();$j(".profile-jot-net input").attr("disabled","disabled");$j("#profile-jot-desc").html("&nbsp;")}$j("#acl-list-content .acl-list-item").each(function(){$j(this).removeClass("groupshow grouphide")});$j("#acl-list-content .acl-list-item").each(function(){itemid=$j(this).attr("id");type=itemid[0];id=parseInt(itemid.substr(1));btshow=$j(this).children(".acl-button-show").removeClass("selected");bthide=$j(this).children(".acl-button-hide").removeClass("selected");switch(type){case"g":var uclass="";if(that.allow_gid.indexOf(id)>=0){btshow.addClass("selected");bthide.removeClass("selected");uclass="groupshow"}if(that.deny_gid.indexOf(id)>=0){btshow.removeClass("selected");bthide.addClass("selected");uclass="grouphide"}$j(that.group_uids[id]).each(function(i,v){if(uclass=="grouphide")$j("#c"+v).removeClass("groupshow");if(uclass!=""){var cls=$j("#c"+v).attr("class");if(cls==undefined)return true;var hiding=cls.indexOf("grouphide");if(hiding==-1)$j("#c"+v).addClass(uclass)}});break;case"c":if(that.allow_cid.indexOf(id)>=0){btshow.addClass("selected");bthide.removeClass("selected")}if(that.deny_cid.indexOf(id)>=0){btshow.removeClass("selected");bthide.addClass("selected")}}})};ACL.prototype.get=function(start,count,search){var postdata={start:start,count:count,search:search};$j.ajax({type:"POST",url:that.url,data:postdata,dataType:"json",success:that.populate})};ACL.prototype.populate=function(data){var height=Math.ceil(data.tot/that.nw)*42;that.list_content.height(height);$j(data.items).each(function(){html="<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>";html=html.format(this.photo,this.name,this.type,this.id,"",this.network,this.link);if(this.uids!=undefined)that.group_uids[this.id]=this.uids;that.list_content.append(html)});$j(".acl-list-item img[data-src]",that.list_content).each(function(i,el){$j(el).attr("src",$j(el).data("src"))});that.update_view()};
\ No newline at end of file
diff --git a/view/theme/frost/js/main.js b/view/theme/frost/js/main.js
index 91e79ffc38..3f2f135694 100644
--- a/view/theme/frost/js/main.js
+++ b/view/theme/frost/js/main.js
@@ -180,10 +180,9 @@
 					nnm.append(html);
 				});
 
-				$("img[data-src]", nnm).each(function(i, el){
-					// Replace data-src attribute with src attribute for every image
-					$(el).attr('src', $(el).data("src"));
-					$(el).removeAttr("data-src");
+				$j("img[data-src]", nnm).each(function(i, el){
+					// Add src attribute for images with a data-src attribute
+					$j(el).attr('src', $j(el).data("src"));
 				});
 			}
 			notif = eNotif.attr('count');
diff --git a/view/theme/frost/js/main.min.js b/view/theme/frost/js/main.min.js
index f021b7befc..8e52142492 100644
--- a/view/theme/frost/js/main.min.js
+++ b/view/theme/frost/js/main.min.js
@@ -1 +1 @@
-function openClose(listID){listID="#"+listID.replace(/:/g,"\\:");listID=listID.replace(/\./g,"\\.");listID=listID.replace(/@/g,"\\@");if($j(listID).is(":visible")){$j(listID).hide();$j(listID+"-wrapper").show()}else{$j(listID).show();$j(listID+"-wrapper").hide()}}function openMenu(theID){document.getElementById(theID).style.display="block"}function closeMenu(theID){document.getElementById(theID).style.display="none"}var src=null;var prev=null;var livetime=null;var msie=false;var stopped=false;var totStopped=false;var timer=null;var pr=0;var liking=0;var in_progress=false;var langSelect=false;var commentBusy=false;var last_popup_menu=null;var last_popup_button=null;$j(function(){$j.ajaxSetup({cache:false});msie=$j.browser.msie;collapseHeight();$j(".onoff input").each(function(){val=$j(this).val();id=$j(this).attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")});$j(".onoff > a").click(function(event){event.preventDefault();var input=$j(this).siblings("input");var val=1-input.val();var id=input.attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden");$j("#"+id+"_onoff ."+(val==1?"on":"off")).removeClass("hidden");input.val(val)});setupFieldRichtext();function close_last_popup_menu(e){if(last_popup_menu){if("#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")){last_popup_menu.hide();last_popup_button.removeClass("selected");last_popup_menu=null;last_popup_button=null}}}$j("a[rel^=#]").click(function(e){close_last_popup_menu(e);menu=$j($j(this).attr("rel"));e.preventDefault();e.stopPropagation();if(menu.attr("popup")=="false")return false;$j(this).parent().toggleClass("selected");menu.slideToggle("fast");if(menu.css("display")=="none"){last_popup_menu=null;last_popup_button=null}else{last_popup_menu=menu;last_popup_button=$j(this).parent()}return false});$j("html").click(function(e){close_last_popup_menu(e)});$j("a.popupbox").fancybox({transitionIn:"none",transitionOut:"none"});var notifications_tpl=unescape($j("#nav-notifications-template[rel=template]").html());var notifications_all=unescape($j("<div>").append($j("#nav-notifications-see-all").clone()).html());var notifications_mark=unescape($j("<div>").append($j("#nav-notifications-mark-all").clone()).html());var notifications_empty=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,data){var invalid=$j(data).find("invalid").text();if(invalid==1){window.location.href=window.location.href}var net=$j(data).find("net").text();if(net==0){net="";$j("#net-update").removeClass("show")}else{$j("#net-update").addClass("show")}$j("#net-update").html(net);var home=$j(data).find("home").text();if(home==0){home="";$j("#home-update").removeClass("show")}else{$j("#home-update").addClass("show")}$j("#home-update").html(home);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update").removeClass("show")}else{$j("#intro-update").addClass("show")}$j("#intro-update").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update").removeClass("show")}else{$j("#mail-update").addClass("show")}$j("#mail-update").html(mail);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update-li").removeClass("show")}else{$j("#intro-update-li").addClass("show")}$j("#intro-update-li").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update-li").removeClass("show")}else{$j("#mail-update-li").addClass("show")}$j("#mail-update-li").html(mail);var eNotif=$j(data).find("notif");if(eNotif.children("note").length==0){$j("#nav-notifications-menu").html(notifications_empty)}else{nnm=$j("#nav-notifications-menu");nnm.html(notifications_all+notifications_mark);eNotif.children("note").each(function(){e=$j(this);text=e.text().format("<span class='contactname'>"+e.attr("name")+"</span>");html=notifications_tpl.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen"));nnm.append(html)})}notif=eNotif.attr("count");if(notif>0){$j("#nav-notifications-linkmenu").addClass("on")}else{$j("#nav-notifications-linkmenu").removeClass("on")}if(notif==0){notif="";$j("#notify-update").removeClass("show")}else{$j("#notify-update").addClass("show")}$j("#notify-update").html(notif);var eSysmsg=$j(data).find("sysmsgs");eSysmsg.children("notice").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"notice",life:3e3})});eSysmsg.children("info").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"info",life:1e3})})});NavUpdate();$j(document).keydown(function(event){if(event.keyCode=="8"){var target=event.target||event.srcElement;if(!/input|textarea/i.test(target.nodeName)){return false}}if(event.keyCode=="19"||event.ctrlKey&&event.which=="32"){event.preventDefault();if(stopped==false){stopped=true;if(event.ctrlKey){totStopped=true}$j("#pause").html('<img src="images/pause.gif" alt="pause" style="border: 1px solid black;" />')}else{unpause()}}else{if(!totStopped){unpause()}}})});function NavUpdate(){if(!stopped){var pingCmd="ping"+(localUser!=0?"?f=&uid="+localUser:"");$j.get(pingCmd,function(data){$j(data).find("result").each(function(){$j("nav").trigger("nav-update",this);if($j("#live-network").length){src="network";liveUpdate()}if($j("#live-profile").length){src="profile";liveUpdate()}if($j("#live-community").length){src="community";liveUpdate()}if($j("#live-notes").length){src="notes";liveUpdate()}if($j("#live-display").length){src="display";liveUpdate()}if($j("#live-photos").length){if(liking){liking=0;window.location.href=window.location.href}}})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$j(".like-rotator").hide();return}if($j(".comment-edit-text-full").length||in_progress){if(livetime){clearTimeout(livetime)}livetime=setTimeout(liveUpdate,1e4);return}if(livetime!=null)livetime=null;prev="live-"+src;in_progress=true;var udargs=netargs.length?"/"+netargs:"";var update_url="update_"+src+udargs+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$j.get(update_url,function(data){in_progress=false;$j(".toplevel_item",data).each(function(){var ident=$j(this).attr("id");if($j("#"+ident).length==0&&profile_page==1){$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("#"+prev).after($j(this))}else{var id=$j(".hide-comments-total",this).attr("id");if(typeof id!="undefined"){id=id.split("-")[3];var commentsOpen=$j("#collapsed-comments-"+id).is(":visible")}$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("html").height($j("html").height());$j("#"+ident).replaceWith($j(this));if(typeof id!="undefined"){if(commentsOpen)showHideComments(id)}$j("html").height("auto")}prev=ident});$j(".like-rotator").hide();if(commentBusy){commentBusy=false;$j("body").css("cursor","auto")}$j(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");collapseHeight()})}function collapseHeight(elems){var elemName=".wall-item-body:not(.divmore)";if(typeof elems!="undefined"){elemName=elems+" "+elemName}$j(elemName).each(function(){if($j(this).height()>450){$j("html").height($j("html").height());$j(this).divgrow({initialHeight:400,showBrackets:false,speed:0});$j(this).addClass("divmore");$j("html").height("auto")}})}function imgbright(node){$j(node).removeClass("drophide").addClass("drop")}function imgdull(node){$j(node).removeClass("drop").addClass("drophide")}function dolike(ident,verb){unpause();$j("#like-rotator-"+ident.toString()).show();$j.get("like/"+ident.toString()+"?verb="+verb,NavUpdate);liking=1}function dostar(ident){ident=ident.toString();$j.get("starred/"+ident,function(data){if(data.match(/1/)){$j("#starred-"+ident).addClass("starred");$j("#starred-"+ident).removeClass("unstarred");$j("#star-"+ident).addClass("hidden");$j("#unstar-"+ident).removeClass("hidden")}else{$j("#starred-"+ident).addClass("unstarred");$j("#starred-"+ident).removeClass("starred");$j("#star-"+ident).removeClass("hidden");$j("#unstar-"+ident).addClass("hidden")}})}function getPosition(e){var cursor={x:0,y:0};if(e.pageX||e.pageY){cursor.x=e.pageX;cursor.y=e.pageY}else{if(e.clientX||e.clientY){cursor.x=e.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft;cursor.y=e.clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop}else{if(e.x||e.y){cursor.x=e.x;cursor.y=e.y}}}return cursor}var lockvisible=false;function lockview(event,id){event=event||window.event;cursor=getPosition(event);if(lockvisible){lockviewhide()}else{lockvisible=true;$j.get("lockview/"+id,function(data){$j("#panel").html(data);$j("#panel").css({left:cursor.x+5,top:cursor.y+5});$j("#panel").show()})}}function lockviewhide(){lockvisible=false;$j("#panel").hide()}function post_comment(id){unpause();commentBusy=true;$j("body").css("cursor","wait");$j("#comment-preview-inp-"+id).val("0");$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.success){$j("#comment-edit-wrapper-"+id).hide();$j("#comment-edit-text-"+id).val("");var tarea=document.getElementById("comment-edit-text-"+id);if(tarea)commentClose(tarea,id);if(timer)clearTimeout(timer);timer=setTimeout(NavUpdate,10)}if(data.reload){window.location.href=data.reload}},"json");return false}function preview_comment(id){$j("#comment-preview-inp-"+id).val("1");$j("#comment-edit-preview-"+id).show();$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.preview){$j("#comment-edit-preview-"+id).html(data.preview);$j("#comment-edit-preview-"+id+" a").click(function(){return false})}},"json");return true}function showHideComments(id){if($j("#collapsed-comments-"+id).is(":visible")){$j("#collapsed-comments-"+id).hide();$j("#hide-comments-"+id).html(window.showMore)}else{$j("#collapsed-comments-"+id).show();$j("#hide-comments-"+id).html(window.showFewer);collapseHeight("#collapsed-comments-"+id)}}function preview_post(){$j("#jot-preview").val("1");$j("#jot-preview-content").show();tinyMCE.triggerSave();$j.post("item",$j("#profile-jot-form").serialize(),function(data){if(data.preview){$j("#jot-preview-content").html(data.preview);$j("#jot-preview-content"+" a").click(function(){return false})}},"json");$j("#jot-preview").val("0");return true}function unpause(){totStopped=false;stopped=false;$j("#pause").html("")}function bin2hex(s){var v,i,f=0,a=[];s+="";f=s.length;for(i=0;i<f;i++){a[i]=s.charCodeAt(i).toString(16).replace(/^([\da-f])$/,"0$1")}return a.join("")}function groupChangeMember(gid,cid,sec_token){$j("body .fakelink").css("cursor","wait");$j.get("group/"+gid+"/"+cid+"?t="+sec_token,function(data){$j("#group-update-wrapper").html(data);$j("body .fakelink").css("cursor","auto")})}function profChangeMember(gid,cid){$j("body .fakelink").css("cursor","wait");$j.get("profperm/"+gid+"/"+cid,function(data){$j("#prof-update-wrapper").html(data);$j("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(gid,cid){$j("body").css("cursor","wait");$j.get("contactgroup/"+gid+"/"+cid,function(data){$j("body").css("cursor","auto")})}function checkboxhighlight(box){if($j(box).is(":checked")){$j(box).addClass("checkeditem")}else{$j(box).removeClass("checkeditem")}}function notifyMarkAll(){$j.get("notify/mark/all",function(data){if(timer)clearTimeout(timer);timer=setTimeout(NavUpdate,1e3)})}function fcFileBrowser(field_name,url,type,win){var cmsURL=baseurl+"/fbrowser/"+type+"/";tinyMCE.activeEditor.windowManager.open({file:cmsURL,title:"File Browser",width:420,height:400,resizable:"yes",inline:"yes",close_previous:"no"},{window:win,input:field_name});return false}function setupFieldRichtext(){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:"fieldRichtext",plugins:"bbcode,paste, inlinepopups",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,force_p_newlines:false,force_br_newlines:true,forced_root_block:"",convert_urls:false,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:false,file_browser_callback:"fcFileBrowser"})}String.prototype.format=function(){var formatted=this;for(var i=0;i<arguments.length;i++){var regexp=new RegExp("\\{"+i+"\\}","gi");formatted=formatted.replace(regexp,arguments[i])}return formatted};Array.prototype.remove=function(item){to=undefined;from=this.indexOf(item);var rest=this.slice((to||from)+1||this.length);this.length=from<0?this.length+from:from;return this.push.apply(this,rest)};function previewTheme(elm){theme=$j(elm).val();$j.getJSON("pretheme?f=&theme="+theme,function(data){$j("#theme-preview").html('<div id="theme-desc">'+data.desc+'</div><div id="theme-version">'+data.version+'</div><div id="theme-credits">'+data.credits+'</div><a href="'+data.img+'"><img src="'+data.img+'" width="320" height="240" alt="'+theme+'" /></a>')})}
\ No newline at end of file
+function openClose(listID){listID="#"+listID.replace(/:/g,"\\:");listID=listID.replace(/\./g,"\\.");listID=listID.replace(/@/g,"\\@");if($j(listID).is(":visible")){$j(listID).hide();$j(listID+"-wrapper").show()}else{$j(listID).show();$j(listID+"-wrapper").hide()}}function openMenu(theID){document.getElementById(theID).style.display="block"}function closeMenu(theID){document.getElementById(theID).style.display="none"}var src=null;var prev=null;var livetime=null;var msie=false;var stopped=false;var totStopped=false;var timer=null;var pr=0;var liking=0;var in_progress=false;var langSelect=false;var commentBusy=false;var last_popup_menu=null;var last_popup_button=null;$j(function(){$j.ajaxSetup({cache:false});msie=$j.browser.msie;collapseHeight();$j(".onoff input").each(function(){val=$j(this).val();id=$j(this).attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")});$j(".onoff > a").click(function(event){event.preventDefault();var input=$j(this).siblings("input");var val=1-input.val();var id=input.attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden");$j("#"+id+"_onoff ."+(val==1?"on":"off")).removeClass("hidden");input.val(val)});setupFieldRichtext();function close_last_popup_menu(e){if(last_popup_menu){if("#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")){last_popup_menu.hide();last_popup_button.removeClass("selected");last_popup_menu=null;last_popup_button=null}}}$j("a[rel^=#]").click(function(e){close_last_popup_menu(e);menu=$j($j(this).attr("rel"));e.preventDefault();e.stopPropagation();if(menu.attr("popup")=="false")return false;$j(this).parent().toggleClass("selected");menu.slideToggle("fast");if(menu.css("display")=="none"){last_popup_menu=null;last_popup_button=null}else{last_popup_menu=menu;last_popup_button=$j(this).parent()}return false});$j("html").click(function(e){close_last_popup_menu(e)});$j("a.popupbox").fancybox({transitionIn:"none",transitionOut:"none"});var notifications_tpl=unescape($j("#nav-notifications-template[rel=template]").html());var notifications_all=unescape($j("<div>").append($j("#nav-notifications-see-all").clone()).html());var notifications_mark=unescape($j("<div>").append($j("#nav-notifications-mark-all").clone()).html());var notifications_empty=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,data){var invalid=$j(data).find("invalid").text();if(invalid==1){window.location.href=window.location.href}var net=$j(data).find("net").text();if(net==0){net="";$j("#net-update").removeClass("show")}else{$j("#net-update").addClass("show")}$j("#net-update").html(net);var home=$j(data).find("home").text();if(home==0){home="";$j("#home-update").removeClass("show")}else{$j("#home-update").addClass("show")}$j("#home-update").html(home);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update").removeClass("show")}else{$j("#intro-update").addClass("show")}$j("#intro-update").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update").removeClass("show")}else{$j("#mail-update").addClass("show")}$j("#mail-update").html(mail);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update-li").removeClass("show")}else{$j("#intro-update-li").addClass("show")}$j("#intro-update-li").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update-li").removeClass("show")}else{$j("#mail-update-li").addClass("show")}$j("#mail-update-li").html(mail);var eNotif=$j(data).find("notif");if(eNotif.children("note").length==0){$j("#nav-notifications-menu").html(notifications_empty)}else{nnm=$j("#nav-notifications-menu");nnm.html(notifications_all+notifications_mark);eNotif.children("note").each(function(){e=$j(this);text=e.text().format("<span class='contactname'>"+e.attr("name")+"</span>");html=notifications_tpl.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen"));nnm.append(html)});$j("img[data-src]",nnm).each(function(i,el){$j(el).attr("src",$j(el).data("src"))})}notif=eNotif.attr("count");if(notif>0){$j("#nav-notifications-linkmenu").addClass("on")}else{$j("#nav-notifications-linkmenu").removeClass("on")}if(notif==0){notif="";$j("#notify-update").removeClass("show")}else{$j("#notify-update").addClass("show")}$j("#notify-update").html(notif);var eSysmsg=$j(data).find("sysmsgs");eSysmsg.children("notice").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"notice",life:3e3})});eSysmsg.children("info").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"info",life:1e3})})});NavUpdate();$j(document).keydown(function(event){if(event.keyCode=="8"){var target=event.target||event.srcElement;if(!/input|textarea/i.test(target.nodeName)){return false}}if(event.keyCode=="19"||event.ctrlKey&&event.which=="32"){event.preventDefault();if(stopped==false){stopped=true;if(event.ctrlKey){totStopped=true}$j("#pause").html('<img src="images/pause.gif" alt="pause" style="border: 1px solid black;" />')}else{unpause()}}else{if(!totStopped){unpause()}}})});function NavUpdate(){if(!stopped){var pingCmd="ping"+(localUser!=0?"?f=&uid="+localUser:"");$j.get(pingCmd,function(data){$j(data).find("result").each(function(){$j("nav").trigger("nav-update",this);if($j("#live-network").length){src="network";liveUpdate()}if($j("#live-profile").length){src="profile";liveUpdate()}if($j("#live-community").length){src="community";liveUpdate()}if($j("#live-notes").length){src="notes";liveUpdate()}if($j("#live-display").length){src="display";liveUpdate()}if($j("#live-photos").length){if(liking){liking=0;window.location.href=window.location.href}}})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$j(".like-rotator").hide();return}if($j(".comment-edit-text-full").length||in_progress){if(livetime){clearTimeout(livetime)}livetime=setTimeout(liveUpdate,1e4);return}if(livetime!=null)livetime=null;prev="live-"+src;in_progress=true;var udargs=netargs.length?"/"+netargs:"";var update_url="update_"+src+udargs+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$j.get(update_url,function(data){in_progress=false;$j(".toplevel_item",data).each(function(){var ident=$j(this).attr("id");if($j("#"+ident).length==0&&profile_page==1){$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("#"+prev).after($j(this))}else{var id=$j(".hide-comments-total",this).attr("id");if(typeof id!="undefined"){id=id.split("-")[3];var commentsOpen=$j("#collapsed-comments-"+id).is(":visible")}$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("html").height($j("html").height());$j("#"+ident).replaceWith($j(this));if(typeof id!="undefined"){if(commentsOpen)showHideComments(id)}$j("html").height("auto")}prev=ident});$j(".like-rotator").hide();if(commentBusy){commentBusy=false;$j("body").css("cursor","auto")}$j(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");collapseHeight()})}function collapseHeight(elems){var elemName=".wall-item-body:not(.divmore)";if(typeof elems!="undefined"){elemName=elems+" "+elemName}$j(elemName).each(function(){if($j(this).height()>450){$j("html").height($j("html").height());$j(this).divgrow({initialHeight:400,showBrackets:false,speed:0});$j(this).addClass("divmore");$j("html").height("auto")}})}function imgbright(node){$j(node).removeClass("drophide").addClass("drop")}function imgdull(node){$j(node).removeClass("drop").addClass("drophide")}function dolike(ident,verb){unpause();$j("#like-rotator-"+ident.toString()).show();$j.get("like/"+ident.toString()+"?verb="+verb,NavUpdate);liking=1}function dostar(ident){ident=ident.toString();$j.get("starred/"+ident,function(data){if(data.match(/1/)){$j("#starred-"+ident).addClass("starred");$j("#starred-"+ident).removeClass("unstarred");$j("#star-"+ident).addClass("hidden");$j("#unstar-"+ident).removeClass("hidden")}else{$j("#starred-"+ident).addClass("unstarred");$j("#starred-"+ident).removeClass("starred");$j("#star-"+ident).removeClass("hidden");$j("#unstar-"+ident).addClass("hidden")}})}function getPosition(e){var cursor={x:0,y:0};if(e.pageX||e.pageY){cursor.x=e.pageX;cursor.y=e.pageY}else{if(e.clientX||e.clientY){cursor.x=e.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft;cursor.y=e.clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop}else{if(e.x||e.y){cursor.x=e.x;cursor.y=e.y}}}return cursor}var lockvisible=false;function lockview(event,id){event=event||window.event;cursor=getPosition(event);if(lockvisible){lockviewhide()}else{lockvisible=true;$j.get("lockview/"+id,function(data){$j("#panel").html(data);$j("#panel").css({left:cursor.x+5,top:cursor.y+5});$j("#panel").show()})}}function lockviewhide(){lockvisible=false;$j("#panel").hide()}function post_comment(id){unpause();commentBusy=true;$j("body").css("cursor","wait");$j("#comment-preview-inp-"+id).val("0");$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.success){$j("#comment-edit-wrapper-"+id).hide();$j("#comment-edit-text-"+id).val("");var tarea=document.getElementById("comment-edit-text-"+id);if(tarea)commentClose(tarea,id);if(timer)clearTimeout(timer);timer=setTimeout(NavUpdate,10)}if(data.reload){window.location.href=data.reload}},"json");return false}function preview_comment(id){$j("#comment-preview-inp-"+id).val("1");$j("#comment-edit-preview-"+id).show();$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.preview){$j("#comment-edit-preview-"+id).html(data.preview);$j("#comment-edit-preview-"+id+" a").click(function(){return false})}},"json");return true}function showHideComments(id){if($j("#collapsed-comments-"+id).is(":visible")){$j("#collapsed-comments-"+id).hide();$j("#hide-comments-"+id).html(window.showMore)}else{$j("#collapsed-comments-"+id).show();$j("#hide-comments-"+id).html(window.showFewer);collapseHeight("#collapsed-comments-"+id)}}function preview_post(){$j("#jot-preview").val("1");$j("#jot-preview-content").show();tinyMCE.triggerSave();$j.post("item",$j("#profile-jot-form").serialize(),function(data){if(data.preview){$j("#jot-preview-content").html(data.preview);$j("#jot-preview-content"+" a").click(function(){return false})}},"json");$j("#jot-preview").val("0");return true}function unpause(){totStopped=false;stopped=false;$j("#pause").html("")}function bin2hex(s){var v,i,f=0,a=[];s+="";f=s.length;for(i=0;i<f;i++){a[i]=s.charCodeAt(i).toString(16).replace(/^([\da-f])$/,"0$1")}return a.join("")}function groupChangeMember(gid,cid,sec_token){$j("body .fakelink").css("cursor","wait");$j.get("group/"+gid+"/"+cid+"?t="+sec_token,function(data){$j("#group-update-wrapper").html(data);$j("body .fakelink").css("cursor","auto")})}function profChangeMember(gid,cid){$j("body .fakelink").css("cursor","wait");$j.get("profperm/"+gid+"/"+cid,function(data){$j("#prof-update-wrapper").html(data);$j("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(gid,cid){$j("body").css("cursor","wait");$j.get("contactgroup/"+gid+"/"+cid,function(data){$j("body").css("cursor","auto")})}function checkboxhighlight(box){if($j(box).is(":checked")){$j(box).addClass("checkeditem")}else{$j(box).removeClass("checkeditem")}}function notifyMarkAll(){$j.get("notify/mark/all",function(data){if(timer)clearTimeout(timer);timer=setTimeout(NavUpdate,1e3)})}function fcFileBrowser(field_name,url,type,win){var cmsURL=baseurl+"/fbrowser/"+type+"/";tinyMCE.activeEditor.windowManager.open({file:cmsURL,title:"File Browser",width:420,height:400,resizable:"yes",inline:"yes",close_previous:"no"},{window:win,input:field_name});return false}function setupFieldRichtext(){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:"fieldRichtext",plugins:"bbcode,paste, inlinepopups",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,force_p_newlines:false,force_br_newlines:true,forced_root_block:"",convert_urls:false,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:false,file_browser_callback:"fcFileBrowser"})}String.prototype.format=function(){var formatted=this;for(var i=0;i<arguments.length;i++){var regexp=new RegExp("\\{"+i+"\\}","gi");formatted=formatted.replace(regexp,arguments[i])}return formatted};Array.prototype.remove=function(item){to=undefined;from=this.indexOf(item);var rest=this.slice((to||from)+1||this.length);this.length=from<0?this.length+from:from;return this.push.apply(this,rest)};function previewTheme(elm){theme=$j(elm).val();$j.getJSON("pretheme?f=&theme="+theme,function(data){$j("#theme-preview").html('<div id="theme-desc">'+data.desc+'</div><div id="theme-version">'+data.version+'</div><div id="theme-credits">'+data.credits+'</div><a href="'+data.img+'"><img src="'+data.img+'" width="320" height="240" alt="'+theme+'" /></a>')})}
\ No newline at end of file
diff --git a/view/theme/frost/register.tpl b/view/theme/frost/register.tpl
index 89dcffdf20..15ce5040e2 100644
--- a/view/theme/frost/register.tpl
+++ b/view/theme/frost/register.tpl
@@ -11,10 +11,12 @@
 	<p id="register-realpeople">$realpeople</p>
 
 	<br />
-	<div id="register-openid-wrapper"  class="field input" >
-			$oidhtml
+{{ if $oidlabel }}
+	<div id="register-openid-wrapper" >
+    	<label for="register-openid" id="label-register-openid" >$oidlabel</label><input 	type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="$openid" >
 	</div>
 	<div id="register-openid-end" ></div>
+{{ endif }}
 
 	<div class="register-explain-wrapper">
 	<p id="register-fill-desc">$fillwith $fillext</p>
diff --git a/view/theme/frost/smarty3/acl_selector.tpl b/view/theme/frost/smarty3/acl_selector.tpl
index f3b1abea7c..d18776e367 100644
--- a/view/theme/frost/smarty3/acl_selector.tpl
+++ b/view/theme/frost/smarty3/acl_selector.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="acl-wrapper">
 	<input id="acl-search">
 	<a href="#" id="acl-showall">{{$showall}}</a>
diff --git a/view/theme/frost/smarty3/admin_aside.tpl b/view/theme/frost/smarty3/admin_aside.tpl
index f60a22a99a..024d6195b5 100644
--- a/view/theme/frost/smarty3/admin_aside.tpl
+++ b/view/theme/frost/smarty3/admin_aside.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h4><a href="{{$admurl}}">{{$admtxt}}</a></h4>
 <ul class='admin linklist'>
diff --git a/view/theme/frost/smarty3/admin_site.tpl b/view/theme/frost/smarty3/admin_site.tpl
index e6490260d8..69172468cc 100644
--- a/view/theme/frost/smarty3/admin_site.tpl
+++ b/view/theme/frost/smarty3/admin_site.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
diff --git a/view/theme/frost/smarty3/admin_users.tpl b/view/theme/frost/smarty3/admin_users.tpl
index d7a7ef2ca0..9d74a5e77e 100644
--- a/view/theme/frost/smarty3/admin_users.tpl
+++ b/view/theme/frost/smarty3/admin_users.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script>
 	function confirm_delete(uname){
 		return confirm( "{{$confirm_delete}}".format(uname));
diff --git a/view/theme/frost/smarty3/comment_item.tpl b/view/theme/frost/smarty3/comment_item.tpl
index f571be9070..2f341072a0 100644
--- a/view/theme/frost/smarty3/comment_item.tpl
+++ b/view/theme/frost/smarty3/comment_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!--		<script>
 		$(document).ready( function () {
 			$(document).mouseup(function(e) {
diff --git a/view/theme/frost/smarty3/contact_end.tpl b/view/theme/frost/smarty3/contact_end.tpl
index 8d48e5ddfd..3c01c0d9aa 100644
--- a/view/theme/frost/smarty3/contact_end.tpl
+++ b/view/theme/frost/smarty3/contact_end.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script language="javascript" type="text/javascript">
 window.editSelect = "{{$editselect}}";
diff --git a/view/theme/frost/smarty3/contact_head.tpl b/view/theme/frost/smarty3/contact_head.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/theme/frost/smarty3/contact_head.tpl
+++ b/view/theme/frost/smarty3/contact_head.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/theme/frost/smarty3/contact_template.tpl b/view/theme/frost/smarty3/contact_template.tpl
index 31febae0c5..649829606c 100644
--- a/view/theme/frost/smarty3/contact_template.tpl
+++ b/view/theme/frost/smarty3/contact_template.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" >
 	<div class="contact-entry-photo-wrapper" >
diff --git a/view/theme/frost/smarty3/contacts-end.tpl b/view/theme/frost/smarty3/contacts-end.tpl
index bf19b00c0e..9298a4245c 100644
--- a/view/theme/frost/smarty3/contacts-end.tpl
+++ b/view/theme/frost/smarty3/contacts-end.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script src="{{$baseurl}}/library/jquery_ac/friendica.complete.min.js" ></script>
 
diff --git a/view/theme/frost/smarty3/contacts-head.tpl b/view/theme/frost/smarty3/contacts-head.tpl
index 5ae97f9f0c..dd66b71d3e 100644
--- a/view/theme/frost/smarty3/contacts-head.tpl
+++ b/view/theme/frost/smarty3/contacts-head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script>
 	window.autocompleteType = 'contacts-head';
diff --git a/view/theme/frost/smarty3/contacts-template.tpl b/view/theme/frost/smarty3/contacts-template.tpl
index 6d76f9e0da..de33d141bb 100644
--- a/view/theme/frost/smarty3/contacts-template.tpl
+++ b/view/theme/frost/smarty3/contacts-template.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$header}}{{if $total}} ({{$total}}){{/if}}</h1>
 
 {{if $finding}}<h4>{{$finding}}</h4>{{/if}}
@@ -15,8 +20,8 @@
 
 
 <div id="contacts-display-wrapper">
-{{foreach $contacts as $c}}
-	{{include file="contact_template.tpl" contact=$c}}
+{{foreach $contacts as $contact}}
+	{{include file="contact_template.tpl"}}
 {{/foreach}}
 </div>
 <div id="contact-edit-end"></div>
diff --git a/view/theme/frost/smarty3/cropbody.tpl b/view/theme/frost/smarty3/cropbody.tpl
index 2678488e7d..5ace9a1aaf 100644
--- a/view/theme/frost/smarty3/cropbody.tpl
+++ b/view/theme/frost/smarty3/cropbody.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$title}}</h1>
 <p id="cropimage-desc">
 {{$desc}}
diff --git a/view/theme/frost/smarty3/cropend.tpl b/view/theme/frost/smarty3/cropend.tpl
index a56c71d92e..7a828815b9 100644
--- a/view/theme/frost/smarty3/cropend.tpl
+++ b/view/theme/frost/smarty3/cropend.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
       <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
       <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
       <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>
diff --git a/view/theme/frost/smarty3/crophead.tpl b/view/theme/frost/smarty3/crophead.tpl
index 56e941e3ab..6438cfb354 100644
--- a/view/theme/frost/smarty3/crophead.tpl
+++ b/view/theme/frost/smarty3/crophead.tpl
@@ -1 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
       <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />
diff --git a/view/theme/frost/smarty3/display-head.tpl b/view/theme/frost/smarty3/display-head.tpl
index 1fc82ae779..17d17dd7db 100644
--- a/view/theme/frost/smarty3/display-head.tpl
+++ b/view/theme/frost/smarty3/display-head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script>
 	window.autoCompleteType = 'display-head';
 </script>
diff --git a/view/theme/frost/smarty3/end.tpl b/view/theme/frost/smarty3/end.tpl
index dc8cb63b66..242937e34e 100644
--- a/view/theme/frost/smarty3/end.tpl
+++ b/view/theme/frost/smarty3/end.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!--[if IE]>
 <script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 <![endif]-->
diff --git a/view/theme/frost/smarty3/event_end.tpl b/view/theme/frost/smarty3/event_end.tpl
index 740c428ede..0ff4e339b5 100644
--- a/view/theme/frost/smarty3/event_end.tpl
+++ b/view/theme/frost/smarty3/event_end.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script language="javascript" type="text/javascript"
           src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
 
diff --git a/view/theme/frost/smarty3/event_head.tpl b/view/theme/frost/smarty3/event_head.tpl
index a1e8789294..9d1c4b5f94 100644
--- a/view/theme/frost/smarty3/event_head.tpl
+++ b/view/theme/frost/smarty3/event_head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <link rel='stylesheet' type='text/css' href='{{$baseurl}}/library/fullcalendar/fullcalendar.css' />
 
 <script language="javascript" type="text/javascript">
diff --git a/view/theme/frost/smarty3/field_combobox.tpl b/view/theme/frost/smarty3/field_combobox.tpl
index 4d12304c9b..8f0e17619f 100644
--- a/view/theme/frost/smarty3/field_combobox.tpl
+++ b/view/theme/frost/smarty3/field_combobox.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field combobox'>
 		<label for='id_{{$field.0}}' id='id_{{$field.0}}_label'>{{$field.1}}</label>
diff --git a/view/theme/frost/smarty3/field_input.tpl b/view/theme/frost/smarty3/field_input.tpl
index 41a636fca4..0847961887 100644
--- a/view/theme/frost/smarty3/field_input.tpl
+++ b/view/theme/frost/smarty3/field_input.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field input' id='wrapper_{{$field.0}}'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/theme/frost/smarty3/field_openid.tpl b/view/theme/frost/smarty3/field_openid.tpl
index d8a9394a15..ed94fad7a5 100644
--- a/view/theme/frost/smarty3/field_openid.tpl
+++ b/view/theme/frost/smarty3/field_openid.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field input openid' id='wrapper_{{$field.0}}'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/theme/frost/smarty3/field_password.tpl b/view/theme/frost/smarty3/field_password.tpl
index 5dd2c5d3f8..c88d3ef58a 100644
--- a/view/theme/frost/smarty3/field_password.tpl
+++ b/view/theme/frost/smarty3/field_password.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field password' id='wrapper_{{$field.0}}'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/theme/frost/smarty3/field_themeselect.tpl b/view/theme/frost/smarty3/field_themeselect.tpl
index f1cd7935b1..0d4552c3bf 100644
--- a/view/theme/frost/smarty3/field_themeselect.tpl
+++ b/view/theme/frost/smarty3/field_themeselect.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 	<div class='field select'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/theme/frost/smarty3/filebrowser.tpl b/view/theme/frost/smarty3/filebrowser.tpl
index cfcd9e823f..c9e1df9749 100644
--- a/view/theme/frost/smarty3/filebrowser.tpl
+++ b/view/theme/frost/smarty3/filebrowser.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE html>
 <html>
 	<head>
diff --git a/view/theme/frost/smarty3/head.tpl b/view/theme/frost/smarty3/head.tpl
index 111f05facd..7c9a975026 100644
--- a/view/theme/frost/smarty3/head.tpl
+++ b/view/theme/frost/smarty3/head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <base href="{{$baseurl}}/" />
 <meta name="generator" content="{{$generator}}" />
diff --git a/view/theme/frost/smarty3/jot-end.tpl b/view/theme/frost/smarty3/jot-end.tpl
index 079481a63e..055ecc5e61 100644
--- a/view/theme/frost/smarty3/jot-end.tpl
+++ b/view/theme/frost/smarty3/jot-end.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.min.js" ></script>
 
diff --git a/view/theme/frost/smarty3/jot-header.tpl b/view/theme/frost/smarty3/jot-header.tpl
index 6e852af220..2ef86d5a8e 100644
--- a/view/theme/frost/smarty3/jot-header.tpl
+++ b/view/theme/frost/smarty3/jot-header.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script>
 	var none = "none"; // ugly hack: {{$editselect}} shouldn't be a string if TinyMCE is enabled, but should if it isn't
diff --git a/view/theme/frost/smarty3/jot.tpl b/view/theme/frost/smarty3/jot.tpl
index 0639d4e67a..21485029ff 100644
--- a/view/theme/frost/smarty3/jot.tpl
+++ b/view/theme/frost/smarty3/jot.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div id="profile-jot-wrapper" >
 	<div id="profile-jot-banner-wrapper">
diff --git a/view/theme/frost/smarty3/jot_geotag.tpl b/view/theme/frost/smarty3/jot_geotag.tpl
index 3f8bee91a7..d828980e58 100644
--- a/view/theme/frost/smarty3/jot_geotag.tpl
+++ b/view/theme/frost/smarty3/jot_geotag.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 	if(navigator.geolocation) {
 		navigator.geolocation.getCurrentPosition(function(position) {
diff --git a/view/theme/frost/smarty3/lang_selector.tpl b/view/theme/frost/smarty3/lang_selector.tpl
index 945cbf51e3..a1aee8277f 100644
--- a/view/theme/frost/smarty3/lang_selector.tpl
+++ b/view/theme/frost/smarty3/lang_selector.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="lang-select-icon" class="icon s22 language" title="{{$title}}" onclick="openClose('language-selector');" ></div>
 <div id="language-selector" style="display: none;" >
 	<form action="#" method="post" >
diff --git a/view/theme/frost/smarty3/login.tpl b/view/theme/frost/smarty3/login.tpl
index 284d59929d..872f1455e7 100644
--- a/view/theme/frost/smarty3/login.tpl
+++ b/view/theme/frost/smarty3/login.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="login-form">
 <form action="{{$dest_url}}" method="post" >
diff --git a/view/theme/frost/smarty3/login_head.tpl b/view/theme/frost/smarty3/login_head.tpl
index 8e217aca1c..eff41619fe 100644
--- a/view/theme/frost/smarty3/login_head.tpl
+++ b/view/theme/frost/smarty3/login_head.tpl
@@ -1,2 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!--<link rel="stylesheet" href="{{$baseurl}}/view/theme/frost/login-style.css" type="text/css" media="all" />-->
 
diff --git a/view/theme/frost/smarty3/lostpass.tpl b/view/theme/frost/smarty3/lostpass.tpl
index 4add629026..bbcdbdb53a 100644
--- a/view/theme/frost/smarty3/lostpass.tpl
+++ b/view/theme/frost/smarty3/lostpass.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="lostpass-form">
 <h2>{{$title}}</h2>
 <br /><br /><br />
diff --git a/view/theme/frost/smarty3/message-end.tpl b/view/theme/frost/smarty3/message-end.tpl
index bf19b00c0e..9298a4245c 100644
--- a/view/theme/frost/smarty3/message-end.tpl
+++ b/view/theme/frost/smarty3/message-end.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script src="{{$baseurl}}/library/jquery_ac/friendica.complete.min.js" ></script>
 
diff --git a/view/theme/frost/smarty3/message-head.tpl b/view/theme/frost/smarty3/message-head.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/theme/frost/smarty3/message-head.tpl
+++ b/view/theme/frost/smarty3/message-head.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/theme/frost/smarty3/moderated_comment.tpl b/view/theme/frost/smarty3/moderated_comment.tpl
index 8fbdf4bc4b..b2401ca483 100644
--- a/view/theme/frost/smarty3/moderated_comment.tpl
+++ b/view/theme/frost/smarty3/moderated_comment.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
 			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
 				<input type="hidden" name="type" value="{{$type}}" />
diff --git a/view/theme/frost/smarty3/msg-end.tpl b/view/theme/frost/smarty3/msg-end.tpl
index 7b63efd977..de30e9bce1 100644
--- a/view/theme/frost/smarty3/msg-end.tpl
+++ b/view/theme/frost/smarty3/msg-end.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <!--<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>-->
 <script type="text/javascript" src="js/ajaxupload.min.js" ></script>
diff --git a/view/theme/frost/smarty3/msg-header.tpl b/view/theme/frost/smarty3/msg-header.tpl
index bc85fa13ef..f5286890b8 100644
--- a/view/theme/frost/smarty3/msg-header.tpl
+++ b/view/theme/frost/smarty3/msg-header.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script language="javascript" type="text/javascript">
 	window.nickname = "{{$nickname}}";
diff --git a/view/theme/frost/smarty3/nav.tpl b/view/theme/frost/smarty3/nav.tpl
index 6e1d78dcc7..98fffbe095 100644
--- a/view/theme/frost/smarty3/nav.tpl
+++ b/view/theme/frost/smarty3/nav.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <nav>
 	{{$langselector}}
 
diff --git a/view/theme/frost/smarty3/photo_edit.tpl b/view/theme/frost/smarty3/photo_edit.tpl
index 3ef88791c3..04b39451ae 100644
--- a/view/theme/frost/smarty3/photo_edit.tpl
+++ b/view/theme/frost/smarty3/photo_edit.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <form action="photos/{{$nickname}}/{{$resource_id}}" method="post" id="photo_edit_form" >
 
diff --git a/view/theme/frost/smarty3/photo_edit_head.tpl b/view/theme/frost/smarty3/photo_edit_head.tpl
index 5d91e1169b..857e6e63ac 100644
--- a/view/theme/frost/smarty3/photo_edit_head.tpl
+++ b/view/theme/frost/smarty3/photo_edit_head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script>
 	window.prevLink = "{{$prevlink}}";
diff --git a/view/theme/frost/smarty3/photo_view.tpl b/view/theme/frost/smarty3/photo_view.tpl
index b2d637a962..354fb9c28b 100644
--- a/view/theme/frost/smarty3/photo_view.tpl
+++ b/view/theme/frost/smarty3/photo_view.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="live-display"></div>
 <h3><a href="{{$album.0}}">{{$album.1}}</a></h3>
 
diff --git a/view/theme/frost/smarty3/photos_head.tpl b/view/theme/frost/smarty3/photos_head.tpl
index f733d622f0..5d7e0152da 100644
--- a/view/theme/frost/smarty3/photos_head.tpl
+++ b/view/theme/frost/smarty3/photos_head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script>
 	window.isPublic = "{{$ispublic}}";
diff --git a/view/theme/frost/smarty3/photos_upload.tpl b/view/theme/frost/smarty3/photos_upload.tpl
index 9cc29b038b..233672a312 100644
--- a/view/theme/frost/smarty3/photos_upload.tpl
+++ b/view/theme/frost/smarty3/photos_upload.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h3>{{$pagename}}</h3>
 
 <div id="photos-usage-message">{{$usage}}</div>
diff --git a/view/theme/frost/smarty3/posted_date_widget.tpl b/view/theme/frost/smarty3/posted_date_widget.tpl
index d3d0c1996b..6482f66559 100644
--- a/view/theme/frost/smarty3/posted_date_widget.tpl
+++ b/view/theme/frost/smarty3/posted_date_widget.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="datebrowse-sidebar" class="widget">
 	<h3>{{$title}}</h3>
 <script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script>
diff --git a/view/theme/frost/smarty3/profed_end.tpl b/view/theme/frost/smarty3/profed_end.tpl
index 21b20a652e..d1c44d0a9d 100644
--- a/view/theme/frost/smarty3/profed_end.tpl
+++ b/view/theme/frost/smarty3/profed_end.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script type="text/javascript" src="js/country.min.js" ></script>
 
diff --git a/view/theme/frost/smarty3/profed_head.tpl b/view/theme/frost/smarty3/profed_head.tpl
index bd300a669a..c8dbe562f9 100644
--- a/view/theme/frost/smarty3/profed_head.tpl
+++ b/view/theme/frost/smarty3/profed_head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script language="javascript" type="text/javascript">
 	window.editSelect = "{{$editselect}}";
diff --git a/view/theme/frost/smarty3/profile_edit.tpl b/view/theme/frost/smarty3/profile_edit.tpl
index 15127ac943..2a38795d66 100644
--- a/view/theme/frost/smarty3/profile_edit.tpl
+++ b/view/theme/frost/smarty3/profile_edit.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$default}}
 
 <h1>{{$banner}}</h1>
diff --git a/view/theme/frost/smarty3/profile_vcard.tpl b/view/theme/frost/smarty3/profile_vcard.tpl
index 91630b0ec3..85c6345d6d 100644
--- a/view/theme/frost/smarty3/profile_vcard.tpl
+++ b/view/theme/frost/smarty3/profile_vcard.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="vcard">
 
 	<div class="fn label">{{$profile.name}}</div>
diff --git a/view/theme/frost/smarty3/prv_message.tpl b/view/theme/frost/smarty3/prv_message.tpl
index 7ff0d1b468..363ca4e26c 100644
--- a/view/theme/frost/smarty3/prv_message.tpl
+++ b/view/theme/frost/smarty3/prv_message.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h3>{{$header}}</h3>
 
diff --git a/view/theme/frost/smarty3/register.tpl b/view/theme/frost/smarty3/register.tpl
index 6b8e85a03c..6cb4c6d859 100644
--- a/view/theme/frost/smarty3/register.tpl
+++ b/view/theme/frost/smarty3/register.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class='register-form'>
 <h2>{{$regtitle}}</h2>
 <br /><br />
@@ -11,10 +16,12 @@
 	<p id="register-realpeople">{{$realpeople}}</p>
 
 	<br />
-	<div id="register-openid-wrapper"  class="field input" >
-			{{$oidhtml}}
+{{if $oidlabel}}
+	<div id="register-openid-wrapper" >
+    	<label for="register-openid" id="label-register-openid" >{{$oidlabel}}</label><input 	type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="{{$openid}}" >
 	</div>
 	<div id="register-openid-end" ></div>
+{{/if}}
 
 	<div class="register-explain-wrapper">
 	<p id="register-fill-desc">{{$fillwith}} {{$fillext}}</p>
diff --git a/view/theme/frost/smarty3/settings-head.tpl b/view/theme/frost/smarty3/settings-head.tpl
index f733d622f0..5d7e0152da 100644
--- a/view/theme/frost/smarty3/settings-head.tpl
+++ b/view/theme/frost/smarty3/settings-head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script>
 	window.isPublic = "{{$ispublic}}";
diff --git a/view/theme/frost/smarty3/settings_display_end.tpl b/view/theme/frost/smarty3/settings_display_end.tpl
index 894e447c61..4b3db00f5a 100644
--- a/view/theme/frost/smarty3/settings_display_end.tpl
+++ b/view/theme/frost/smarty3/settings_display_end.tpl
@@ -1,2 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	<script>$j(function(){ previewTheme($j("#id_{{$theme.0}}")[0]); });</script>
 
diff --git a/view/theme/frost/smarty3/threaded_conversation.tpl b/view/theme/frost/smarty3/threaded_conversation.tpl
index 680a201eef..f5c9b3c63c 100644
--- a/view/theme/frost/smarty3/threaded_conversation.tpl
+++ b/view/theme/frost/smarty3/threaded_conversation.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $dropping}}
 <div id="item-delete-selected-top" class="fakelink" onclick="deleteCheckedItems('#item-delete-selected-top');">
   <div id="item-delete-selected-top-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
@@ -13,7 +18,7 @@
 {{$live_update}}
 
 {{foreach $threads as $thread}}
-{{include file="file:{{$thread.template}}" item=$thread}}
+{{include file="{{$thread.template}}" item=$thread}}
 {{/foreach}}
 
 <div id="conversation-end"></div>
diff --git a/view/theme/frost/smarty3/voting_fakelink.tpl b/view/theme/frost/smarty3/voting_fakelink.tpl
index 44e7d37a28..1e073916e1 100644
--- a/view/theme/frost/smarty3/voting_fakelink.tpl
+++ b/view/theme/frost/smarty3/voting_fakelink.tpl
@@ -1,2 +1,6 @@
-		<span class="fakelink-wrapper" id={{$vote_id}}-wrapper><span class="fakelink" onclick="openClose('{{$vote_id}}');">{{$count}} {{$people}}</span> {{$vote_mood}}</span>
-
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<span class="fakelink-wrapper"  id="{{$type}}list-{{$id}}-wrapper">{{$phrase}}</span>
diff --git a/view/theme/frost/smarty3/wall_thread.tpl b/view/theme/frost/smarty3/wall_thread.tpl
index a0c576b18b..d6782484f8 100644
--- a/view/theme/frost/smarty3/wall_thread.tpl
+++ b/view/theme/frost/smarty3/wall_thread.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $item.comment_firstcollapsed}}
 	<div class="hide-comments-outer">
 	<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
@@ -112,7 +117,7 @@
 <!--<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>-->
 <!--</div>-->
 {{foreach $item.children as $child}}
-	{{include file="file:{{$child.template}}" item=$child}}
+	{{include file="{{$child.template}}" item=$child}}
 {{/foreach}}
 
 {{if $item.flatten}}
diff --git a/view/theme/frost/smarty3/wallmsg-end.tpl b/view/theme/frost/smarty3/wallmsg-end.tpl
index d9e34d6fba..a0da3e095b 100644
--- a/view/theme/frost/smarty3/wallmsg-end.tpl
+++ b/view/theme/frost/smarty3/wallmsg-end.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script language="javascript" type="text/javascript">
 wallInitEditor();
diff --git a/view/theme/frost/smarty3/wallmsg-header.tpl b/view/theme/frost/smarty3/wallmsg-header.tpl
index e3dba23e78..dcf8ae94df 100644
--- a/view/theme/frost/smarty3/wallmsg-header.tpl
+++ b/view/theme/frost/smarty3/wallmsg-header.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script language="javascript" type="text/javascript">
 window.editSelect = "{{$editselect}}";
diff --git a/view/theme/frost/voting_fakelink.tpl b/view/theme/frost/voting_fakelink.tpl
index c342046970..b66302cc27 100644
--- a/view/theme/frost/voting_fakelink.tpl
+++ b/view/theme/frost/voting_fakelink.tpl
@@ -1,2 +1 @@
-		<span class="fakelink-wrapper" id=$vote_id-wrapper><span class="fakelink" onclick="openClose('$vote_id');">$count $people</span> $vote_mood</span>
-
+<span class="fakelink-wrapper"  id="$[type]list-$id-wrapper">$phrase</span>
diff --git a/view/theme/greenzero/theme.php b/view/theme/greenzero/theme.php
index 09a63c040d..9a3dd1d3e1 100644
--- a/view/theme/greenzero/theme.php
+++ b/view/theme/greenzero/theme.php
@@ -1,10 +1,11 @@
 <?php
+
+function greenzero_init(&$a) {
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
 set_template_engine($a, 'smarty3');
 
-function greenzero_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
 function insertFormatting(comment,BBcode,id) {
diff --git a/view/theme/purplezero/theme.php b/view/theme/purplezero/theme.php
index fc9d5f91c8..c78e5cccce 100644
--- a/view/theme/purplezero/theme.php
+++ b/view/theme/purplezero/theme.php
@@ -1,10 +1,11 @@
 <?php
+
+function purplezero_init(&$a) {
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
 set_template_engine($a, 'smarty3');
 
-function purplezero_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
 function insertFormatting(comment,BBcode,id) {
diff --git a/view/theme/quattro/mail_display.tpl b/view/theme/quattro/mail_display.tpl
index 5d16bd32bb..2b680ae428 100644
--- a/view/theme/quattro/mail_display.tpl
+++ b/view/theme/quattro/mail_display.tpl
@@ -3,9 +3,9 @@
 	<a href="message/dropconv/$thread_id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
 </div>
 
-{{ for $mails as $mail_item }}
+{{ for $mails as $mail }}
 	<div id="tread-wrapper-$mail_item.id" class="tread-wrapper">
-		{{ inc mail_conv.tpl with $mail=$mail_item }}{{endinc}}
+		{{ inc mail_conv.tpl }}{{endinc}}
 	</div>
 {{ endfor }}
 
diff --git a/view/theme/quattro/smarty3/birthdays_reminder.tpl b/view/theme/quattro/smarty3/birthdays_reminder.tpl
index 8b13789179..f951fc97a8 100644
--- a/view/theme/quattro/smarty3/birthdays_reminder.tpl
+++ b/view/theme/quattro/smarty3/birthdays_reminder.tpl
@@ -1 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
diff --git a/view/theme/quattro/smarty3/comment_item.tpl b/view/theme/quattro/smarty3/comment_item.tpl
index 0b3036bc6c..1e6a6e69c4 100644
--- a/view/theme/quattro/smarty3/comment_item.tpl
+++ b/view/theme/quattro/smarty3/comment_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
 			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
 				<input type="hidden" name="type" value="{{$type}}" />
diff --git a/view/theme/quattro/smarty3/contact_template.tpl b/view/theme/quattro/smarty3/contact_template.tpl
index cf2ac7b243..9788388e76 100644
--- a/view/theme/quattro/smarty3/contact_template.tpl
+++ b/view/theme/quattro/smarty3/contact_template.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="contact-wrapper" id="contact-entry-wrapper-{{$id}}" >
 	<div class="contact-photo-wrapper" >
diff --git a/view/theme/quattro/smarty3/conversation.tpl b/view/theme/quattro/smarty3/conversation.tpl
index f22b11a751..4e3553894b 100644
--- a/view/theme/quattro/smarty3/conversation.tpl
+++ b/view/theme/quattro/smarty3/conversation.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$live_update}}
 
 {{foreach $threads as $thread}}
@@ -17,7 +22,7 @@
 		{{if $item.type == tag}}
 			{{include file="wall_item_tag.tpl"}}
 		{{else}}
-			{{include file="file:{{$item.template}}"}}
+			{{include file="{{$item.template}}"}}
 		{{/if}}
 		
 	{{/foreach}}
diff --git a/view/theme/quattro/smarty3/events_reminder.tpl b/view/theme/quattro/smarty3/events_reminder.tpl
index 34410ddbcb..e8a6b906bc 100644
--- a/view/theme/quattro/smarty3/events_reminder.tpl
+++ b/view/theme/quattro/smarty3/events_reminder.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <link rel='stylesheet' type='text/css' href='{{$baseurl}}/library/fullcalendar/fullcalendar.css' />
 <script language="javascript" type="text/javascript"
           src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
diff --git a/view/theme/quattro/smarty3/fileas_widget.tpl b/view/theme/quattro/smarty3/fileas_widget.tpl
index 23d001d462..555ac5feb3 100644
--- a/view/theme/quattro/smarty3/fileas_widget.tpl
+++ b/view/theme/quattro/smarty3/fileas_widget.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="fileas-sidebar" class="widget">
 	<h3>{{$title}}</h3>
 	<div id="nets-desc">{{$desc}}</div>
diff --git a/view/theme/quattro/smarty3/generic_links_widget.tpl b/view/theme/quattro/smarty3/generic_links_widget.tpl
index e10ded9f4c..802563255c 100644
--- a/view/theme/quattro/smarty3/generic_links_widget.tpl
+++ b/view/theme/quattro/smarty3/generic_links_widget.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="widget">
 	{{if $title}}<h3>{{$title}}</h3>{{/if}}
 	{{if $desc}}<div class="desc">{{$desc}}</div>{{/if}}
diff --git a/view/theme/quattro/smarty3/group_side.tpl b/view/theme/quattro/smarty3/group_side.tpl
index d0fb5d62b6..b71f1f1e2f 100644
--- a/view/theme/quattro/smarty3/group_side.tpl
+++ b/view/theme/quattro/smarty3/group_side.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="group-sidebar" class="widget">
 	<div class="title tool">
 		<h3 class="label">{{$title}}</h3>
diff --git a/view/theme/quattro/smarty3/jot.tpl b/view/theme/quattro/smarty3/jot.tpl
index 21df47dfa8..f9f36a37db 100644
--- a/view/theme/quattro/smarty3/jot.tpl
+++ b/view/theme/quattro/smarty3/jot.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <form id="profile-jot-form" action="{{$action}}" method="post">
 	<div id="jot">
 		<div id="profile-jot-desc" class="jothidden">&nbsp;</div>
diff --git a/view/theme/quattro/smarty3/mail_conv.tpl b/view/theme/quattro/smarty3/mail_conv.tpl
index 69673470ed..3ddc8e99f8 100644
--- a/view/theme/quattro/smarty3/mail_conv.tpl
+++ b/view/theme/quattro/smarty3/mail_conv.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="wall-item-container {{$item.indent}}">
 	<div class="wall-item-item">
 		<div class="wall-item-info">
diff --git a/view/theme/quattro/smarty3/mail_display.tpl b/view/theme/quattro/smarty3/mail_display.tpl
index 7a96cbf361..dc1fbbc6f5 100644
--- a/view/theme/quattro/smarty3/mail_display.tpl
+++ b/view/theme/quattro/smarty3/mail_display.tpl
@@ -1,11 +1,16 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="mail-display-subject">
 	<span class="{{if $thread_seen}}seen{{else}}unseen{{/if}}">{{$thread_subject}}</span>
 	<a href="message/dropconv/{{$thread_id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="mail-delete icon s22 delete"></a>
 </div>
 
-{{foreach $mails as $mail_item}}
+{{foreach $mails as $mail}}
 	<div id="tread-wrapper-{{$mail_item.id}}" class="tread-wrapper">
-		{{include file="mail_conv.tpl" mail=$mail_item}}
+		{{include file="mail_conv.tpl"}}
 	</div>
 {{/foreach}}
 
diff --git a/view/theme/quattro/smarty3/mail_list.tpl b/view/theme/quattro/smarty3/mail_list.tpl
index 038607e4df..0090668740 100644
--- a/view/theme/quattro/smarty3/mail_list.tpl
+++ b/view/theme/quattro/smarty3/mail_list.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="mail-list-wrapper">
 	<span class="mail-subject {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
 	<span class="mail-from">{{$from_name}}</span>
diff --git a/view/theme/quattro/smarty3/message_side.tpl b/view/theme/quattro/smarty3/message_side.tpl
index c8a372c744..723b0b710c 100644
--- a/view/theme/quattro/smarty3/message_side.tpl
+++ b/view/theme/quattro/smarty3/message_side.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="message-sidebar" class="widget">
 	<div id="message-new" class="{{if $new.sel}}selected{{/if}}"><a href="{{$new.url}}">{{$new.label}}</a> </div>
 	
diff --git a/view/theme/quattro/smarty3/nav.tpl b/view/theme/quattro/smarty3/nav.tpl
index 1e25b0472b..2118c1e348 100644
--- a/view/theme/quattro/smarty3/nav.tpl
+++ b/view/theme/quattro/smarty3/nav.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <header>
 	{{* {{$langselector}} *}}
 
diff --git a/view/theme/quattro/smarty3/nets.tpl b/view/theme/quattro/smarty3/nets.tpl
index 981bd8d2c8..dfe133251f 100644
--- a/view/theme/quattro/smarty3/nets.tpl
+++ b/view/theme/quattro/smarty3/nets.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="nets-sidebar" class="widget">
 	<h3>{{$title}}</h3>
 	<div id="nets-desc">{{$desc}}</div>
diff --git a/view/theme/quattro/smarty3/photo_view.tpl b/view/theme/quattro/smarty3/photo_view.tpl
index 8456a2747a..38b3b5216e 100644
--- a/view/theme/quattro/smarty3/photo_view.tpl
+++ b/view/theme/quattro/smarty3/photo_view.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="live-display"></div>
 <h3 id="photo-album-title"><a href="{{$album.0}}">{{$album.1}}</a></h3>
 
diff --git a/view/theme/quattro/smarty3/profile_vcard.tpl b/view/theme/quattro/smarty3/profile_vcard.tpl
index 37df4ae9a1..4b1ddb6e6e 100644
--- a/view/theme/quattro/smarty3/profile_vcard.tpl
+++ b/view/theme/quattro/smarty3/profile_vcard.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="vcard">
 
 	<div class="tool">
diff --git a/view/theme/quattro/smarty3/prv_message.tpl b/view/theme/quattro/smarty3/prv_message.tpl
index 07fcfdadc2..78ff7e7840 100644
--- a/view/theme/quattro/smarty3/prv_message.tpl
+++ b/view/theme/quattro/smarty3/prv_message.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h3>{{$header}}</h3>
 
diff --git a/view/theme/quattro/smarty3/saved_searches_aside.tpl b/view/theme/quattro/smarty3/saved_searches_aside.tpl
index 007d1d956e..6ff59afae4 100644
--- a/view/theme/quattro/smarty3/saved_searches_aside.tpl
+++ b/view/theme/quattro/smarty3/saved_searches_aside.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="saved-search-list" class="widget">
 	<h3 class="title">{{$title}}</h3>
 
diff --git a/view/theme/quattro/smarty3/search_item.tpl b/view/theme/quattro/smarty3/search_item.tpl
index 15fb811074..a5dafa643c 100644
--- a/view/theme/quattro/smarty3/search_item.tpl
+++ b/view/theme/quattro/smarty3/search_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="wall-item-decor">
 	<span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>
diff --git a/view/theme/quattro/smarty3/theme_settings.tpl b/view/theme/quattro/smarty3/theme_settings.tpl
index 9fb2d4c1c9..5df1e99ede 100644
--- a/view/theme/quattro/smarty3/theme_settings.tpl
+++ b/view/theme/quattro/smarty3/theme_settings.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
  <script src="{{$baseurl}}/view/theme/quattro/jquery.tools.min.js"></script>
  
 {{include file="field_select.tpl" field=$color}}
diff --git a/view/theme/quattro/smarty3/threaded_conversation.tpl b/view/theme/quattro/smarty3/threaded_conversation.tpl
index a7516a8a31..dc3e918f61 100644
--- a/view/theme/quattro/smarty3/threaded_conversation.tpl
+++ b/view/theme/quattro/smarty3/threaded_conversation.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$live_update}}
 
 {{foreach $threads as $thread}}
@@ -8,7 +13,7 @@
 		{{if $thread.type == tag}}
 			{{include file="wall_item_tag.tpl" item=$thread}}
 		{{else}}
-			{{include file="file:{{$thread.template}}" item=$thread}}
+			{{include file="{{$thread.template}}" item=$thread}}
 		{{/if}}
 		
 </div>
diff --git a/view/theme/quattro/smarty3/wall_item_tag.tpl b/view/theme/quattro/smarty3/wall_item_tag.tpl
index efcb528881..1e658883c7 100644
--- a/view/theme/quattro/smarty3/wall_item_tag.tpl
+++ b/view/theme/quattro/smarty3/wall_item_tag.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $mode == display}}
 {{else}}
 {{if $item.comment_firstcollapsed}}
diff --git a/view/theme/quattro/smarty3/wall_thread.tpl b/view/theme/quattro/smarty3/wall_thread.tpl
index 68e6d5d102..805ddfaaa9 100644
--- a/view/theme/quattro/smarty3/wall_thread.tpl
+++ b/view/theme/quattro/smarty3/wall_thread.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $mode == display}}
 {{else}}
 {{if $item.comment_firstcollapsed}}
@@ -149,7 +154,7 @@
 	{{if $child.type == tag}}
 		{{include file="wall_item_tag.tpl" item=$child}}
 	{{else}}
-		{{include file="file:{{$item.template}}" item=$child}}
+		{{include file="{{$item.template}}" item=$child}}
 	{{/if}}
 {{/foreach}}
 
diff --git a/view/theme/quattro/theme.php b/view/theme/quattro/theme.php
index 73d35a1628..989a998064 100644
--- a/view/theme/quattro/theme.php
+++ b/view/theme/quattro/theme.php
@@ -7,10 +7,10 @@
  * Maintainer: Tobias <https://diekershoff.homeunix.net/friendica/profile/tobias>
  */
  
+function quattro_init(&$a) {
 $a->theme_info = array();
 set_template_engine($a, 'smarty3');
 
-function quattro_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
 function insertFormatting(comment,BBcode,id) {
diff --git a/view/theme/slack-NS/theme.php b/view/theme/slack-NS/theme.php
index 14d058c7da..20a198a3c5 100644
--- a/view/theme/slack-NS/theme.php
+++ b/view/theme/slack-NS/theme.php
@@ -1,9 +1,10 @@
 <?php
+
+function slack_NS_init(&$a) {
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
 
-function slack_NS_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
 function insertFormatting(comment,BBcode,id) {
@@ -86,4 +87,4 @@ $('.savedsearchterm').hover(
 
 </script>
 EOT;
-}
\ No newline at end of file
+}
diff --git a/view/theme/slackr/smarty3/birthdays_reminder.tpl b/view/theme/slackr/smarty3/birthdays_reminder.tpl
index f577d30903..8af03b33a8 100644
--- a/view/theme/slackr/smarty3/birthdays_reminder.tpl
+++ b/view/theme/slackr/smarty3/birthdays_reminder.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $classtoday}}
 <script>
 	$(document).ready(function() {{$lbr}}
diff --git a/view/theme/slackr/smarty3/events_reminder.tpl b/view/theme/slackr/smarty3/events_reminder.tpl
index b3cc5bc3e2..5bac584219 100644
--- a/view/theme/slackr/smarty3/events_reminder.tpl
+++ b/view/theme/slackr/smarty3/events_reminder.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <link rel='stylesheet' type='text/css' href='{{$baseurl}}/library/fullcalendar/fullcalendar.css' />
 <script language="javascript" type="text/javascript"
           src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
diff --git a/view/theme/slackr/theme.php b/view/theme/slackr/theme.php
index bc09299794..43deb4b8cc 100644
--- a/view/theme/slackr/theme.php
+++ b/view/theme/slackr/theme.php
@@ -1,10 +1,11 @@
 <?php
+
+function slackr_init(&$a) {
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
 set_template_engine($a, 'smarty3');
 
-function slackr_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
 function insertFormatting(comment,BBcode,id) {
diff --git a/view/theme/smoothly/css/typography.css b/view/theme/smoothly/css/typography.css
index dce4657bf3..d62a66883c 100644
--- a/view/theme/smoothly/css/typography.css
+++ b/view/theme/smoothly/css/typography.css
@@ -145,9 +145,11 @@ blockquote, cite, q {
 }
 
 blockquote {
-    background-color: #F4F8F9;
-    border-left: 4px solid #DAE4EE;
-    padding: 0.4em;
+	background-color: #F4F8F9;
+	border-left: 4px solid #DAE4EE;
+	margin: 0;
+	padding: 0.4em;
+	white-space: normal;
 }
 
 strong, b { font-weight:bold; }
diff --git a/view/theme/smoothly/smarty3/bottom.tpl b/view/theme/smoothly/smarty3/bottom.tpl
index 0de92532b4..0c6aa29040 100644
--- a/view/theme/smoothly/smarty3/bottom.tpl
+++ b/view/theme/smoothly/smarty3/bottom.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script type="text/javascript" src="{{$baseurl}}/view/theme/smoothly/js/jquery.autogrow.textarea.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
diff --git a/view/theme/smoothly/smarty3/follow.tpl b/view/theme/smoothly/smarty3/follow.tpl
index 36ea0c75c5..4d9e2a62b8 100644
--- a/view/theme/smoothly/smarty3/follow.tpl
+++ b/view/theme/smoothly/smarty3/follow.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="follow-sidebar" class="widget">
 	<h3>{{$connect}}</h3>
 	<div id="connect-desc">{{$desc}}</div>
diff --git a/view/theme/smoothly/smarty3/jot-header.tpl b/view/theme/smoothly/smarty3/jot-header.tpl
index c4831f3c55..48875e3f70 100644
--- a/view/theme/smoothly/smarty3/jot-header.tpl
+++ b/view/theme/smoothly/smarty3/jot-header.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script language="javascript" type="text/javascript">
 
diff --git a/view/theme/smoothly/smarty3/jot.tpl b/view/theme/smoothly/smarty3/jot.tpl
index 67242deae0..0fd09c1965 100644
--- a/view/theme/smoothly/smarty3/jot.tpl
+++ b/view/theme/smoothly/smarty3/jot.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div id="profile-jot-wrapper" > 
 	<div id="profile-jot-banner-wrapper">
diff --git a/view/theme/smoothly/smarty3/lang_selector.tpl b/view/theme/smoothly/smarty3/lang_selector.tpl
index 945cbf51e3..a1aee8277f 100644
--- a/view/theme/smoothly/smarty3/lang_selector.tpl
+++ b/view/theme/smoothly/smarty3/lang_selector.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="lang-select-icon" class="icon s22 language" title="{{$title}}" onclick="openClose('language-selector');" ></div>
 <div id="language-selector" style="display: none;" >
 	<form action="#" method="post" >
diff --git a/view/theme/smoothly/smarty3/login.tpl b/view/theme/smoothly/smarty3/login.tpl
index 1f355385a1..0860f66f1e 100644
--- a/view/theme/smoothly/smarty3/login.tpl
+++ b/view/theme/smoothly/smarty3/login.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <img style="float:left; margin:5px 20px 0 0" src="/images/friendica-128.png" title="friendica">
 
 <div class="login-form">
diff --git a/view/theme/smoothly/smarty3/nav.tpl b/view/theme/smoothly/smarty3/nav.tpl
index 24b9dd2001..0bbca7e694 100644
--- a/view/theme/smoothly/smarty3/nav.tpl
+++ b/view/theme/smoothly/smarty3/nav.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <nav>
 	<span id="banner">{{$banner}}</span>
 
diff --git a/view/theme/smoothly/smarty3/search_item.tpl b/view/theme/smoothly/smarty3/search_item.tpl
index a319676fe9..0d77d544af 100644
--- a/view/theme/smoothly/smarty3/search_item.tpl
+++ b/view/theme/smoothly/smarty3/search_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="wall-item-outside-wrapper {{$item.indent}} {{$item.shiny}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
 	<div class="wall-item-content-wrapper {{$item.indent}} {{$item.shiny}}" id="wall-item-content-wrapper-{{$item.id}}" >
 		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
diff --git a/view/theme/smoothly/smarty3/wall_thread.tpl b/view/theme/smoothly/smarty3/wall_thread.tpl
index b0538b9791..ae703a8560 100644
--- a/view/theme/smoothly/smarty3/wall_thread.tpl
+++ b/view/theme/smoothly/smarty3/wall_thread.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $item.comment_firstcollapsed}}
 	<div class="hide-comments-outer">
 		<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> 
@@ -148,7 +153,7 @@
 <div class="wall-item-outside-wrapper-end {{$item.indent}} {{$item.shiny}}" ></div>
 
 {{foreach $item.children as $child}}
-	{{include file="file:{{$child.template}}" item=$child}}
+	{{include file="{{$child.template}}" item=$child}}
 {{/foreach}}
 
 {{if $item.flatten}}
diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index aa62d59949..41fd0c9075 100644
--- a/view/theme/smoothly/style.css
+++ b/view/theme/smoothly/style.css
@@ -2,7 +2,7 @@
   	style.css
   	Smoothly
    
-	Created by alex@friendica.pixelbits.de on 2012-11-14
+	Created by alex@friendica.pixelbits.de on 2013-01-11
 
 ** Colors ** 
 Blue links - #1873a2
@@ -1946,9 +1946,10 @@ div[id$="wrapper"] br {
 	clear:both; 
 }
 
-.profile-match-name a {
-	color: #999;
-	font-size: 1em;
+.profile-match-name {
+        float: left;
+        text-align: left;
+        overflow: hidden;
 }
 
 .profile-match-name a:hover {
@@ -1956,20 +1957,36 @@ div[id$="wrapper"] br {
 }
 
 .profile-match-wrapper {
+	position: relative;
 	float:left;
-	height:120px;
-	padding:10px;
-	width:120px;
-	margin-bottom: 10px;
-	/*margin-left: 20px;*/
+	height:80px;
+	padding:5px;
+	width:80px;
+	margin-bottom: 70px;
+	margin-right: 29px;
 	background-color: #f6f6f6;
 	border: 1px solid #dddddd;
 	box-shadow: 3px 3px 4px #959494;
 		-moz-box-shadow: 3px 3px 4px #959494;
 		-webkit-box-shadow: 3px 3px 4px #959494;
-	clear: both;	
 }
 
+.profile-match-break,
+.profile-match-end {
+        clear: both;
+}
+
+.profile-match-connect {
+        text-align: left;
+        font-weight: bold;
+}
+.profile-match-ignore {
+	height: 0!important;
+}
+
+#profile-match-wrapper-end {
+        clear: both;
+}
 .profile-match-end {
 	clear: both;
 }
diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php
index 1f1ee7327b..16a33d678c 100644
--- a/view/theme/smoothly/theme.php
+++ b/view/theme/smoothly/theme.php
@@ -2,18 +2,17 @@
 
 /*
  * Name: Smoothly
- * Description: Like coffee with milk. Theme works fine with iPad[2].
- * Version: Version 0.11.14-2
+ * Description: Like coffee with milk. Theme optimized for iPad[2].
+ * Version: Version 0.132
  * Author: Alex <https://friendica.pixelbits.de/profile/alex>
  * Maintainer: Alex <https://friendica.pixelbits.de/profile/alex>
  * Screenshot: <a href="screenshot.png">Screenshot</a>
  */
 
-$a = get_app();
-$a->theme_info = array();
-set_template_engine($a, 'smarty3');
-
 function smoothly_init(&$a) {
+	$a->theme_info = array();
+	set_template_engine($a, 'smarty3');
+
 	$cssFile = null;
 	$ssl_state = null;
 	$baseurl = $a->get_baseurl($ssl_state);
diff --git a/view/theme/testbubble/smarty3/comment_item.tpl b/view/theme/testbubble/smarty3/comment_item.tpl
index 2235bbe306..95ea5afd75 100644
--- a/view/theme/testbubble/smarty3/comment_item.tpl
+++ b/view/theme/testbubble/smarty3/comment_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
 			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
 				<input type="hidden" name="type" value="{{$type}}" />
diff --git a/view/theme/testbubble/smarty3/group_drop.tpl b/view/theme/testbubble/smarty3/group_drop.tpl
index 1f703c3f58..f5039fd8fa 100644
--- a/view/theme/testbubble/smarty3/group_drop.tpl
+++ b/view/theme/testbubble/smarty3/group_drop.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="group-delete-wrapper" id="group-delete-wrapper-{{$id}}" >
 	<a href="group/drop/{{$id}}" 
 		onclick="return confirmDelete();" 
diff --git a/view/theme/testbubble/smarty3/group_edit.tpl b/view/theme/testbubble/smarty3/group_edit.tpl
index cbb394bd36..aaa0d5670e 100644
--- a/view/theme/testbubble/smarty3/group_edit.tpl
+++ b/view/theme/testbubble/smarty3/group_edit.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h2>{{$title}}</h2>
 
 
diff --git a/view/theme/testbubble/smarty3/group_side.tpl b/view/theme/testbubble/smarty3/group_side.tpl
index b417a0ed62..db246b6de9 100644
--- a/view/theme/testbubble/smarty3/group_side.tpl
+++ b/view/theme/testbubble/smarty3/group_side.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="widget" id="group-sidebar">
 <h3>{{$title}}</h3>
 
diff --git a/view/theme/testbubble/smarty3/jot-header.tpl b/view/theme/testbubble/smarty3/jot-header.tpl
index 13d1673946..08aa748d15 100644
--- a/view/theme/testbubble/smarty3/jot-header.tpl
+++ b/view/theme/testbubble/smarty3/jot-header.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script language="javascript" type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
 <script language="javascript" type="text/javascript">
diff --git a/view/theme/testbubble/smarty3/jot.tpl b/view/theme/testbubble/smarty3/jot.tpl
index b035cb0704..8d281dbaaa 100644
--- a/view/theme/testbubble/smarty3/jot.tpl
+++ b/view/theme/testbubble/smarty3/jot.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div id="profile-jot-wrapper" > 
 	<div id="profile-jot-banner-wrapper">
diff --git a/view/theme/testbubble/smarty3/match.tpl b/view/theme/testbubble/smarty3/match.tpl
index 03938aba10..61a861c1cc 100644
--- a/view/theme/testbubble/smarty3/match.tpl
+++ b/view/theme/testbubble/smarty3/match.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="profile-match-wrapper">
 	<div class="profile-match-photo">
 		<a href="{{$url}}">
diff --git a/view/theme/testbubble/smarty3/nav.tpl b/view/theme/testbubble/smarty3/nav.tpl
index 11ce89cb5d..be7c2e7b66 100644
--- a/view/theme/testbubble/smarty3/nav.tpl
+++ b/view/theme/testbubble/smarty3/nav.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <nav>
 	{{$langselector}}
 
diff --git a/view/theme/testbubble/smarty3/photo_album.tpl b/view/theme/testbubble/smarty3/photo_album.tpl
index 40c95aa93a..7ca7bd9d62 100644
--- a/view/theme/testbubble/smarty3/photo_album.tpl
+++ b/view/theme/testbubble/smarty3/photo_album.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="photo-album-image-wrapper" id="photo-album-image-wrapper-{{$id}}">
 	<a href="{{$photolink}}" class="photo-album-photo-link" id="photo-album-photo-link-{{$id}}" title="{{$phototitle}}">
 		<img src="{{$imgsrc}}" alt="{{$imgalt}}" title="{{$phototitle}}" class="photo-album-photo lframe  resize" id="photo-album-photo-{{$id}}" />
diff --git a/view/theme/testbubble/smarty3/photo_top.tpl b/view/theme/testbubble/smarty3/photo_top.tpl
index 6057e6cdf0..915609b7f0 100644
--- a/view/theme/testbubble/smarty3/photo_top.tpl
+++ b/view/theme/testbubble/smarty3/photo_top.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="photo-top-image-wrapper lframe" id="photo-top-image-wrapper-{{$id}}">
 	<div id="photo-album-wrapper-inner">
diff --git a/view/theme/testbubble/smarty3/photo_view.tpl b/view/theme/testbubble/smarty3/photo_view.tpl
index 31f9082530..fa5af03a1e 100644
--- a/view/theme/testbubble/smarty3/photo_view.tpl
+++ b/view/theme/testbubble/smarty3/photo_view.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="live-display"></div>
 <h3><a href="{{$album.0}}">{{$album.1}}</a></h3>
 
diff --git a/view/theme/testbubble/smarty3/profile_entry.tpl b/view/theme/testbubble/smarty3/profile_entry.tpl
index ad3e17979e..66997c3788 100644
--- a/view/theme/testbubble/smarty3/profile_entry.tpl
+++ b/view/theme/testbubble/smarty3/profile_entry.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="profile-listing" >
 <div class="profile-listing-photo-wrapper" >
diff --git a/view/theme/testbubble/smarty3/profile_vcard.tpl b/view/theme/testbubble/smarty3/profile_vcard.tpl
index a93f6c7895..96e37d5e44 100644
--- a/view/theme/testbubble/smarty3/profile_vcard.tpl
+++ b/view/theme/testbubble/smarty3/profile_vcard.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="vcard">
 	<div class="fn label">{{$profile.name}}</div>
 				
diff --git a/view/theme/testbubble/smarty3/saved_searches_aside.tpl b/view/theme/testbubble/smarty3/saved_searches_aside.tpl
index 2ec7992fe0..6778dde36e 100644
--- a/view/theme/testbubble/smarty3/saved_searches_aside.tpl
+++ b/view/theme/testbubble/smarty3/saved_searches_aside.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="widget" id="saved-search-list">
 	<h3 id="search">{{$title}}</h3>
 	{{$searchbox}}
diff --git a/view/theme/testbubble/smarty3/search_item.tpl b/view/theme/testbubble/smarty3/search_item.tpl
index a319676fe9..0d77d544af 100644
--- a/view/theme/testbubble/smarty3/search_item.tpl
+++ b/view/theme/testbubble/smarty3/search_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="wall-item-outside-wrapper {{$item.indent}} {{$item.shiny}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
 	<div class="wall-item-content-wrapper {{$item.indent}} {{$item.shiny}}" id="wall-item-content-wrapper-{{$item.id}}" >
 		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
diff --git a/view/theme/testbubble/smarty3/wall_thread.tpl b/view/theme/testbubble/smarty3/wall_thread.tpl
index 8a0150e5b0..5c1a70f73d 100644
--- a/view/theme/testbubble/smarty3/wall_thread.tpl
+++ b/view/theme/testbubble/smarty3/wall_thread.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $item.comment_firstcollapsed}}
 	<div class="hide-comments-outer">
 	<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
@@ -95,7 +100,7 @@
 <div class="wall-item-outside-wrapper-end {{$item.indent}} {{$item.shiny}}" ></div>
 
 {{foreach $item.children as $child}}
-	{{include file="file:{{$child.template}}" item=$child}}
+	{{include file="{{$child.template}}" item=$child}}
 {{/foreach}}
 
 {{if $item.flatten}}
diff --git a/view/theme/testbubble/theme.php b/view/theme/testbubble/theme.php
index ab5d175fe5..366a4718cc 100644
--- a/view/theme/testbubble/theme.php
+++ b/view/theme/testbubble/theme.php
@@ -8,6 +8,8 @@
  * Maintainer: Mike Macgirvin <mike@macgirvin.com>
  */
 
+
+function testbubble_init(&$a) {
 set_template_engine($a, 'smarty3');
 
 $a->page['htmlhead'] .= <<< EOT
@@ -18,3 +20,4 @@ $('html').click(function() { $("#nav-notifications-menu" ).hide(); });
 });
 </script>
 EOT;
+}
diff --git a/view/theme/vier/css/font2.css b/view/theme/vier/css/font2.css
index 1ba1848b9f..2357af604b 100644
--- a/view/theme/vier/css/font2.css
+++ b/view/theme/vier/css/font2.css
@@ -324,7 +324,7 @@ li.icon.icon-large:before {
 .icon.type.unkn:before            { content: "\f059"; }
 
 .icon.drop:before                 { content: "\f014"; }
-.icon.drophilde:before            { content: "\f014"; }
+.icon.drophide:before             { content: "\f014"; }
 
 .small-pencil:before, .savedsearchdrop:before { 
   font-family: FontAwesome;
diff --git a/view/theme/vier/smarty3/comment_item.tpl b/view/theme/vier/smarty3/comment_item.tpl
index 5e4a805dad..45b3c6891b 100644
--- a/view/theme/vier/smarty3/comment_item.tpl
+++ b/view/theme/vier/smarty3/comment_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 		{{if $threaded}}
 		<div class="comment-wwedit-wrapper threaded" id="comment-edit-wrapper-{{$id}}" style="display: block;">
 		{{else}}
diff --git a/view/theme/vier/smarty3/mail_list.tpl b/view/theme/vier/smarty3/mail_list.tpl
index dcb56d0caf..c4d9d68070 100644
--- a/view/theme/vier/smarty3/mail_list.tpl
+++ b/view/theme/vier/smarty3/mail_list.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="mail-list-wrapper">
 	<span class="mail-subject {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
 	<span class="mail-from">{{$from_name}}</span>
diff --git a/view/theme/vier/smarty3/nav.tpl b/view/theme/vier/smarty3/nav.tpl
index fc9e9c6638..ba2aedf530 100644
--- a/view/theme/vier/smarty3/nav.tpl
+++ b/view/theme/vier/smarty3/nav.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <header>
 	{{* {{$langselector}} *}}
 
diff --git a/view/theme/vier/smarty3/profile_edlink.tpl b/view/theme/vier/smarty3/profile_edlink.tpl
index 5bdbb834a5..97990f7bef 100644
--- a/view/theme/vier/smarty3/profile_edlink.tpl
+++ b/view/theme/vier/smarty3/profile_edlink.tpl
@@ -1 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="clear"></div>
diff --git a/view/theme/vier/smarty3/profile_vcard.tpl b/view/theme/vier/smarty3/profile_vcard.tpl
index b02a3a5c69..d1634a7faa 100644
--- a/view/theme/vier/smarty3/profile_vcard.tpl
+++ b/view/theme/vier/smarty3/profile_vcard.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="vcard">
 
 	<div class="tool">
diff --git a/view/theme/vier/smarty3/search_item.tpl b/view/theme/vier/smarty3/search_item.tpl
index c1a20adea1..c6c83f8b86 100644
--- a/view/theme/vier/smarty3/search_item.tpl
+++ b/view/theme/vier/smarty3/search_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="wall-item-decor">
 	<span class="icon star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>
diff --git a/view/theme/vier/smarty3/threaded_conversation.tpl b/view/theme/vier/smarty3/threaded_conversation.tpl
index a7516a8a31..dc3e918f61 100644
--- a/view/theme/vier/smarty3/threaded_conversation.tpl
+++ b/view/theme/vier/smarty3/threaded_conversation.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$live_update}}
 
 {{foreach $threads as $thread}}
@@ -8,7 +13,7 @@
 		{{if $thread.type == tag}}
 			{{include file="wall_item_tag.tpl" item=$thread}}
 		{{else}}
-			{{include file="file:{{$thread.template}}" item=$thread}}
+			{{include file="{{$thread.template}}" item=$thread}}
 		{{/if}}
 		
 </div>
diff --git a/view/theme/vier/smarty3/wall_thread.tpl b/view/theme/vier/smarty3/wall_thread.tpl
index 386164f18c..5559a20659 100644
--- a/view/theme/vier/smarty3/wall_thread.tpl
+++ b/view/theme/vier/smarty3/wall_thread.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $mode == display}}
 {{else}}
 {{if $item.comment_firstcollapsed}}
@@ -150,7 +155,7 @@
 	{{if $item.type == tag}}
 		{{include file="wall_item_tag.tpl" item=$child}}
 	{{else}}
-		{{include file="file:{{$item.template}}" item=$child}}
+		{{include file="{{$item.template}}" item=$child}}
 	{{/if}}
 {{/foreach}}
 
diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index 7c0f3d3f8d..7da0731f78 100644
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -8,11 +8,11 @@
  * Description: "Vier" uses the font awesome font library: http://fortawesome.github.com/Font-Awesome/
  */
 
+function vier_init(&$a) {
 set_template_engine($a, 'smarty3');
 
 $a->theme_info = array();
 
-function vier_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
 function insertFormatting(comment,BBcode,id) {
diff --git a/view/viewcontact_template.tpl b/view/viewcontact_template.tpl
index 714bf03fa7..d6f01643ea 100644
--- a/view/viewcontact_template.tpl
+++ b/view/viewcontact_template.tpl
@@ -1,7 +1,7 @@
 <h3>$title</h3>
 
-{{ for $contacts as $c }}
-	{{ inc contact_template.tpl with $contact=$c }}{{ endinc }}
+{{ for $contacts as $contact }}
+	{{ inc contact_template.tpl }}{{ endinc }}
 {{ endfor }}
 
 <div id="view-contact-end"></div>
diff --git a/view/voting_fakelink.tpl b/view/voting_fakelink.tpl
index cf1e4beb56..a1ff04a703 100644
--- a/view/voting_fakelink.tpl
+++ b/view/voting_fakelink.tpl
@@ -1,2 +1 @@
-		<span class="fakelink" onclick="openClose('$vote_id');">$count $people</span> $vote_mood<br />
-
+$phrase
diff --git a/view/zh-cn/messages.po b/view/zh-cn/messages.po
index 2dff6697fa..8925d7276e 100644
--- a/view/zh-cn/messages.po
+++ b/view/zh-cn/messages.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 # Mike Macgirvin, 2010.
-#   <transifex.mexon@spamgourmet.com>, 2012.
+#   <transifex.mexon@spamgourmet.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2012-11-22 10:00-0800\n"
-"PO-Revision-Date: 2012-11-24 16:29+0000\n"
+"POT-Creation-Date: 2013-01-12 10:00-0800\n"
+"PO-Revision-Date: 2013-01-13 08:58+0000\n"
 "Last-Translator: matthew_exon <transifex.mexon@spamgourmet.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/friendica/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -41,27 +41,28 @@ msgstr "熟人更新失败。"
 #: ../../mod/fsuggest.php:78 ../../mod/events.php:140 ../../mod/api.php:26
 #: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:995
 #: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:135
-#: ../../mod/notifications.php:66 ../../mod/contacts.php:146
-#: ../../mod/settings.php:86 ../../mod/settings.php:525
-#: ../../mod/settings.php:530 ../../mod/manage.php:90 ../../mod/network.php:6
+#: ../../mod/notifications.php:66 ../../mod/contacts.php:147
+#: ../../mod/settings.php:91 ../../mod/settings.php:542
+#: ../../mod/settings.php:547 ../../mod/manage.php:90 ../../mod/network.php:6
 #: ../../mod/notes.php:20 ../../mod/uimport.php:23 ../../mod/wallmessage.php:9
 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
 #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22
-#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:139
+#: ../../mod/register.php:40 ../../mod/regmod.php:118 ../../mod/item.php:139
 #: ../../mod/item.php:155 ../../mod/mood.php:114
 #: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169
 #: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193
-#: ../../mod/message.php:38 ../../mod/message.php:168
+#: ../../mod/message.php:38 ../../mod/message.php:172
 #: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25
 #: ../../mod/wall_upload.php:66 ../../mod/follow.php:9
-#: ../../mod/display.php:165 ../../mod/profiles.php:7
-#: ../../mod/profiles.php:424 ../../mod/delegate.php:6
-#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
-#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510
-#: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159
-#: ../../addon/fbpost/fbpost.php:165
-#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3977
+#: ../../mod/display.php:173 ../../mod/profiles.php:9
+#: ../../mod/profiles.php:148 ../../mod/delegate.php:6
+#: ../../mod/suggest.php:28 ../../mod/invite.php:15 ../../mod/invite.php:83
+#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:512
+#: ../../addon/facebook/facebook.php:518 ../../addon/fbpost/fbpost.php:170
+#: ../../addon/fbpost/fbpost.php:176
+#: ../../addon/dav/friendica/layout.fnk.php:354
+#: ../../addon/tumblr/tumblr.php:34 ../../include/items.php:3987
 #: ../../index.php:333 ../../addon.old/facebook/facebook.php:510
 #: ../../addon.old/facebook/facebook.php:516
 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165
@@ -92,10 +93,10 @@ msgstr "请<strong>立即</strong>用后退按钮如果您不确定怎么用这
 
 #: ../../mod/crepair.php:144
 msgid "Return to contact editor"
-msgstr ""
+msgstr "回归熟人处理器"
 
-#: ../../mod/crepair.php:148 ../../mod/settings.php:545
-#: ../../mod/settings.php:571 ../../mod/admin.php:692 ../../mod/admin.php:702
+#: ../../mod/crepair.php:148 ../../mod/settings.php:562
+#: ../../mod/settings.php:588 ../../mod/admin.php:731 ../../mod/admin.php:741
 msgid "Name"
 msgstr "名字"
 
@@ -132,59 +133,60 @@ msgid "New photo from this URL"
 msgstr "新照片从这个URL"
 
 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
-#: ../../mod/events.php:455 ../../mod/photos.php:1028
-#: ../../mod/photos.php:1104 ../../mod/photos.php:1367
-#: ../../mod/photos.php:1407 ../../mod/photos.php:1451
-#: ../../mod/photos.php:1523 ../../mod/install.php:246
-#: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199
-#: ../../mod/content.php:693 ../../mod/contacts.php:351
-#: ../../mod/settings.php:543 ../../mod/settings.php:697
-#: ../../mod/settings.php:769 ../../mod/settings.php:976
-#: ../../mod/group.php:85 ../../mod/mood.php:137 ../../mod/message.php:294
-#: ../../mod/message.php:480 ../../mod/admin.php:443 ../../mod/admin.php:689
-#: ../../mod/admin.php:826 ../../mod/admin.php:1025 ../../mod/admin.php:1112
-#: ../../mod/profiles.php:594 ../../mod/invite.php:119
-#: ../../addon/fromgplus/fromgplus.php:40
-#: ../../addon/facebook/facebook.php:619
+#: ../../mod/events.php:466 ../../mod/photos.php:1028
+#: ../../mod/photos.php:1118 ../../mod/photos.php:1402
+#: ../../mod/photos.php:1442 ../../mod/photos.php:1486
+#: ../../mod/photos.php:1569 ../../mod/install.php:248
+#: ../../mod/install.php:286 ../../mod/localtime.php:45 ../../mod/poke.php:199
+#: ../../mod/content.php:710 ../../mod/contacts.php:352
+#: ../../mod/settings.php:560 ../../mod/settings.php:670
+#: ../../mod/settings.php:739 ../../mod/settings.php:811
+#: ../../mod/settings.php:1018 ../../mod/group.php:87 ../../mod/mood.php:137
+#: ../../mod/message.php:301 ../../mod/message.php:527 ../../mod/admin.php:461
+#: ../../mod/admin.php:728 ../../mod/admin.php:865 ../../mod/admin.php:1064
+#: ../../mod/admin.php:1151 ../../mod/profiles.php:623
+#: ../../mod/invite.php:121 ../../addon/fromgplus/fromgplus.php:44
+#: ../../addon/facebook/facebook.php:621
 #: ../../addon/snautofollow/snautofollow.php:64
-#: ../../addon/fbpost/fbpost.php:226 ../../addon/yourls/yourls.php:76
+#: ../../addon/fbpost/fbpost.php:280 ../../addon/yourls/yourls.php:76
 #: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:88
 #: ../../addon/page/page.php:211 ../../addon/planets/planets.php:158
 #: ../../addon/uhremotestorage/uhremotestorage.php:89
 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
-#: ../../addon/remote_permissions/remote_permissions.php:47
-#: ../../addon/remote_permissions/remote_permissions.php:195
+#: ../../addon/remote_permissions/remote_permissions.php:48
+#: ../../addon/remote_permissions/remote_permissions.php:196
 #: ../../addon/startpage/startpage.php:92
 #: ../../addon/geonames/geonames.php:187
-#: ../../addon/forumlist/forumlist.php:175
+#: ../../addon/forumlist/forumlist.php:178
 #: ../../addon/impressum/impressum.php:83
 #: ../../addon/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57
 #: ../../addon/qcomment/qcomment.php:61
-#: ../../addon/openstreetmap/openstreetmap.php:70
+#: ../../addon/openstreetmap/openstreetmap.php:94
 #: ../../addon/group_text/group_text.php:84
 #: ../../addon/libravatar/libravatar.php:99
-#: ../../addon/libertree/libertree.php:90 ../../addon/altpager/altpager.php:87
-#: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84
-#: ../../addon/blackout/blackout.php:98 ../../addon/gravatar/gravatar.php:95
+#: ../../addon/libertree/libertree.php:90 ../../addon/altpager/altpager.php:91
+#: ../../addon/altpager/altpager.php:98 ../../addon/mathjax/mathjax.php:42
+#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:99
+#: ../../addon/gravatar/gravatar.php:95
 #: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93
 #: ../../addon/jappixmini/jappixmini.php:307
-#: ../../addon/statusnet/statusnet.php:278
-#: ../../addon/statusnet/statusnet.php:292
-#: ../../addon/statusnet/statusnet.php:318
-#: ../../addon/statusnet/statusnet.php:325
-#: ../../addon/statusnet/statusnet.php:353
-#: ../../addon/statusnet/statusnet.php:576 ../../addon/tumblr/tumblr.php:90
+#: ../../addon/statusnet/statusnet.php:290
+#: ../../addon/statusnet/statusnet.php:304
+#: ../../addon/statusnet/statusnet.php:330
+#: ../../addon/statusnet/statusnet.php:337
+#: ../../addon/statusnet/statusnet.php:374
+#: ../../addon/statusnet/statusnet.php:752 ../../addon/tumblr/tumblr.php:233
 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88
 #: ../../addon/wppost/wppost.php:110 ../../addon/showmore/showmore.php:48
-#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180
-#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:394
+#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:191
+#: ../../addon/twitter/twitter.php:229 ../../addon/twitter/twitter.php:554
 #: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77
 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103
 #: ../../view/theme/cleanzero/config.php:80
-#: ../../view/theme/diabook/theme.php:645
+#: ../../view/theme/diabook/theme.php:642
 #: ../../view/theme/diabook/config.php:152
 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70
-#: ../../object/Item.php:564 ../../addon.old/fromgplus/fromgplus.php:40
+#: ../../object/Item.php:609 ../../addon.old/fromgplus/fromgplus.php:40
 #: ../../addon.old/facebook/facebook.php:619
 #: ../../addon.old/snautofollow/snautofollow.php:64
 #: ../../addon.old/bg/bg.php:90 ../../addon.old/fbpost/fbpost.php:226
@@ -284,85 +286,87 @@ msgstr "l, F j"
 msgid "Edit event"
 msgstr "编项目"
 
-#: ../../mod/events.php:323 ../../include/text.php:1190
+#: ../../mod/events.php:323 ../../include/text.php:1246
 msgid "link to source"
 msgstr "链接到来源"
 
-#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91
-#: ../../include/nav.php:52 ../../boot.php:1746
+#: ../../mod/events.php:358 ../../view/theme/diabook/theme.php:91
+#: ../../include/nav.php:52 ../../boot.php:1829
 msgid "Events"
 msgstr "事件"
 
-#: ../../mod/events.php:348
+#: ../../mod/events.php:359
 msgid "Create New Event"
 msgstr "造成新的项目"
 
-#: ../../mod/events.php:349 ../../addon/dav/friendica/layout.fnk.php:263
+#: ../../mod/events.php:360 ../../addon/dav/friendica/layout.fnk.php:263
 #: ../../addon.old/dav/friendica/layout.fnk.php:263
 msgid "Previous"
 msgstr "上"
 
-#: ../../mod/events.php:350 ../../mod/install.php:205
+#: ../../mod/events.php:361 ../../mod/install.php:207
 #: ../../addon/dav/friendica/layout.fnk.php:266
 #: ../../addon.old/dav/friendica/layout.fnk.php:266
 msgid "Next"
 msgstr "下"
 
-#: ../../mod/events.php:423
+#: ../../mod/events.php:434
 msgid "hour:minute"
 msgstr "小时：分钟"
 
-#: ../../mod/events.php:433
+#: ../../mod/events.php:444
 msgid "Event details"
 msgstr "项目内容"
 
-#: ../../mod/events.php:434
+#: ../../mod/events.php:445
 #, php-format
 msgid "Format is %s %s. Starting date and Title are required."
 msgstr ""
 
-#: ../../mod/events.php:436
+#: ../../mod/events.php:447
 msgid "Event Starts:"
 msgstr "事件开始:"
 
-#: ../../mod/events.php:436 ../../mod/events.php:450
+#: ../../mod/events.php:447 ../../mod/events.php:461
 msgid "Required"
 msgstr ""
 
-#: ../../mod/events.php:439
+#: ../../mod/events.php:450
 msgid "Finish date/time is not known or not relevant"
 msgstr "结束日/时未知或无关"
 
-#: ../../mod/events.php:441
+#: ../../mod/events.php:452
 msgid "Event Finishes:"
 msgstr "事件结束:"
 
-#: ../../mod/events.php:444
+#: ../../mod/events.php:455
 msgid "Adjust for viewer timezone"
 msgstr "调为观众的时间"
 
-#: ../../mod/events.php:446
+#: ../../mod/events.php:457
 msgid "Description:"
 msgstr "描述："
 
-#: ../../mod/events.php:448 ../../mod/directory.php:134
-#: ../../include/event.php:40 ../../include/bb2diaspora.php:412
-#: ../../boot.php:1276
+#: ../../mod/events.php:459 ../../mod/directory.php:134
+#: ../../addon/forumdirectory/forumdirectory.php:156
+#: ../../include/event.php:40 ../../include/bb2diaspora.php:415
+#: ../../boot.php:1350
 msgid "Location:"
 msgstr "位置:"
 
-#: ../../mod/events.php:450
+#: ../../mod/events.php:461
 msgid "Title:"
 msgstr ""
 
-#: ../../mod/events.php:452
+#: ../../mod/events.php:463
 msgid "Share this event"
 msgstr "分享这个项目"
 
-#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:142
-#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544
-#: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45
-#: ../../include/conversation.php:1005
+#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:145
+#: ../../mod/dfrn_request.php:848 ../../mod/settings.php:561
+#: ../../mod/settings.php:587 ../../mod/fbrowser.php:81
+#: ../../mod/fbrowser.php:116 ../../addon/js_upload/js_upload.php:45
+#: ../../include/conversation.php:1045
 #: ../../addon.old/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr "退消"
@@ -408,44 +412,44 @@ msgid ""
 " and/or create new posts for you?"
 msgstr "您想不想使这个应用用权您的文章和熟人，和／或代您造成新文章"
 
-#: ../../mod/api.php:105 ../../mod/dfrn_request.php:835
-#: ../../mod/settings.php:892 ../../mod/settings.php:898
-#: ../../mod/settings.php:906 ../../mod/settings.php:910
-#: ../../mod/settings.php:915 ../../mod/settings.php:921
-#: ../../mod/settings.php:927 ../../mod/settings.php:933
-#: ../../mod/settings.php:963 ../../mod/settings.php:964
-#: ../../mod/settings.php:965 ../../mod/settings.php:966
-#: ../../mod/settings.php:967 ../../mod/register.php:237
-#: ../../mod/profiles.php:574
+#: ../../mod/api.php:105 ../../mod/dfrn_request.php:836
+#: ../../mod/settings.php:934 ../../mod/settings.php:940
+#: ../../mod/settings.php:948 ../../mod/settings.php:952
+#: ../../mod/settings.php:957 ../../mod/settings.php:963
+#: ../../mod/settings.php:969 ../../mod/settings.php:975
+#: ../../mod/settings.php:1005 ../../mod/settings.php:1006
+#: ../../mod/settings.php:1007 ../../mod/settings.php:1008
+#: ../../mod/settings.php:1009 ../../mod/register.php:239
+#: ../../mod/profiles.php:603
 msgid "Yes"
 msgstr "是"
 
-#: ../../mod/api.php:106 ../../mod/dfrn_request.php:836
-#: ../../mod/settings.php:892 ../../mod/settings.php:898
-#: ../../mod/settings.php:906 ../../mod/settings.php:910
-#: ../../mod/settings.php:915 ../../mod/settings.php:921
-#: ../../mod/settings.php:927 ../../mod/settings.php:933
-#: ../../mod/settings.php:963 ../../mod/settings.php:964
-#: ../../mod/settings.php:965 ../../mod/settings.php:966
-#: ../../mod/settings.php:967 ../../mod/register.php:238
-#: ../../mod/profiles.php:575
+#: ../../mod/api.php:106 ../../mod/dfrn_request.php:837
+#: ../../mod/settings.php:934 ../../mod/settings.php:940
+#: ../../mod/settings.php:948 ../../mod/settings.php:952
+#: ../../mod/settings.php:957 ../../mod/settings.php:963
+#: ../../mod/settings.php:969 ../../mod/settings.php:975
+#: ../../mod/settings.php:1005 ../../mod/settings.php:1006
+#: ../../mod/settings.php:1007 ../../mod/settings.php:1008
+#: ../../mod/settings.php:1009 ../../mod/register.php:240
+#: ../../mod/profiles.php:604
 msgid "No"
 msgstr "否"
 
-#: ../../mod/photos.php:51 ../../boot.php:1739
+#: ../../mod/photos.php:51 ../../boot.php:1822
 msgid "Photo Albums"
 msgstr "相册"
 
 #: ../../mod/photos.php:59 ../../mod/photos.php:154 ../../mod/photos.php:1009
-#: ../../mod/photos.php:1096 ../../mod/photos.php:1111
-#: ../../mod/photos.php:1566 ../../mod/photos.php:1578
-#: ../../addon/communityhome/communityhome.php:110
-#: ../../view/theme/diabook/theme.php:529
+#: ../../mod/photos.php:1102 ../../mod/photos.php:1125
+#: ../../mod/photos.php:1626 ../../mod/photos.php:1638
+#: ../../addon/communityhome/communityhome.php:115
+#: ../../view/theme/diabook/theme.php:492
 #: ../../addon.old/communityhome/communityhome.php:110
 msgid "Contact Photos"
 msgstr "熟人照片"
 
-#: ../../mod/photos.php:66 ../../mod/photos.php:1127 ../../mod/photos.php:1616
+#: ../../mod/photos.php:66 ../../mod/photos.php:1141 ../../mod/photos.php:1685
 msgid "Upload New Photos"
 msgstr "上传新照片"
 
@@ -457,14 +461,14 @@ msgstr "每人"
 msgid "Contact information unavailable"
 msgstr "熟人信息不可用"
 
-#: ../../mod/photos.php:154 ../../mod/photos.php:676 ../../mod/photos.php:1096
-#: ../../mod/photos.php:1111 ../../mod/profile_photo.php:74
+#: ../../mod/photos.php:154 ../../mod/photos.php:676 ../../mod/photos.php:1102
+#: ../../mod/photos.php:1125 ../../mod/profile_photo.php:74
 #: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88
 #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
 #: ../../mod/profile_photo.php:305
-#: ../../addon/communityhome/communityhome.php:111
-#: ../../view/theme/diabook/theme.php:530 ../../include/user.php:324
-#: ../../include/user.php:331 ../../include/user.php:338
+#: ../../addon/communityhome/communityhome.php:116
+#: ../../view/theme/diabook/theme.php:493 ../../include/user.php:325
+#: ../../include/user.php:332 ../../include/user.php:339
 #: ../../addon.old/communityhome/communityhome.php:111
 msgid "Profile Photos"
 msgstr "简介照片"
@@ -473,11 +477,11 @@ msgstr "简介照片"
 msgid "Album not found."
 msgstr "取回不了相册."
 
-#: ../../mod/photos.php:182 ../../mod/photos.php:1105
+#: ../../mod/photos.php:182 ../../mod/photos.php:1119
 msgid "Delete Album"
 msgstr "删除相册"
 
-#: ../../mod/photos.php:245 ../../mod/photos.php:1368
+#: ../../mod/photos.php:245 ../../mod/photos.php:1403
 msgid "Delete Photo"
 msgstr "删除照片"
 
@@ -490,7 +494,7 @@ msgstr ""
 msgid "a photo"
 msgstr ""
 
-#: ../../mod/photos.php:712 ../../addon/js_upload/js_upload.php:315
+#: ../../mod/photos.php:712 ../../addon/js_upload/js_upload.php:321
 #: ../../addon.old/js_upload/js_upload.php:315
 msgid "Image exceeds size limit of "
 msgstr "图片超出最大尺寸"
@@ -510,8 +514,9 @@ msgid "Image upload failed."
 msgstr "图像上载失败了."
 
 #: ../../mod/photos.php:865 ../../mod/community.php:18
-#: ../../mod/dfrn_request.php:760 ../../mod/viewcontacts.php:17
-#: ../../mod/display.php:7 ../../mod/search.php:86 ../../mod/directory.php:31
+#: ../../mod/dfrn_request.php:761 ../../mod/viewcontacts.php:17
+#: ../../mod/display.php:7 ../../mod/search.php:89 ../../mod/directory.php:31
+#: ../../addon/forumdirectory/forumdirectory.php:53
 msgid "Public access denied."
 msgstr "公众看拒绝"
 
@@ -523,167 +528,162 @@ msgstr "没有照片挑选了"
 msgid "Access to this item is restricted."
 msgstr "这个项目使用权限的。"
 
-#: ../../mod/photos.php:1038
+#: ../../mod/photos.php:1037
 #, php-format
 msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
 msgstr ""
 
-#: ../../mod/photos.php:1041
-#, php-format
-msgid "You have used %1$.2f Mbytes of photo storage."
-msgstr ""
-
-#: ../../mod/photos.php:1047
+#: ../../mod/photos.php:1053
 msgid "Upload Photos"
 msgstr "上传照片"
 
-#: ../../mod/photos.php:1051 ../../mod/photos.php:1100
+#: ../../mod/photos.php:1057 ../../mod/photos.php:1114
 msgid "New album name: "
 msgstr "新册名："
 
-#: ../../mod/photos.php:1052
+#: ../../mod/photos.php:1058
 msgid "or existing album name: "
 msgstr "或现有册名"
 
-#: ../../mod/photos.php:1053
+#: ../../mod/photos.php:1059
 msgid "Do not show a status post for this upload"
 msgstr "别显示现状报到关于这个上传"
 
-#: ../../mod/photos.php:1055 ../../mod/photos.php:1363
+#: ../../mod/photos.php:1061 ../../mod/photos.php:1398
 msgid "Permissions"
 msgstr "权利"
 
-#: ../../mod/photos.php:1115
+#: ../../mod/photos.php:1129
 msgid "Edit Album"
 msgstr "编照片册"
 
-#: ../../mod/photos.php:1121
+#: ../../mod/photos.php:1135
 msgid "Show Newest First"
 msgstr ""
 
-#: ../../mod/photos.php:1123
+#: ../../mod/photos.php:1137
 msgid "Show Oldest First"
 msgstr ""
 
-#: ../../mod/photos.php:1147 ../../mod/photos.php:1599
+#: ../../mod/photos.php:1170 ../../mod/photos.php:1668
 msgid "View Photo"
 msgstr "看照片"
 
-#: ../../mod/photos.php:1182
+#: ../../mod/photos.php:1205
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "无权利。用这个项目可能受限制。"
 
-#: ../../mod/photos.php:1184
+#: ../../mod/photos.php:1207
 msgid "Photo not available"
 msgstr "照片不可获得的 "
 
-#: ../../mod/photos.php:1240
+#: ../../mod/photos.php:1263
 msgid "View photo"
 msgstr "看照片"
 
-#: ../../mod/photos.php:1240
+#: ../../mod/photos.php:1263
 msgid "Edit photo"
 msgstr "编辑照片"
 
-#: ../../mod/photos.php:1241
+#: ../../mod/photos.php:1264
 msgid "Use as profile photo"
 msgstr "用为资料图"
 
-#: ../../mod/photos.php:1247 ../../mod/content.php:603
-#: ../../object/Item.php:104
+#: ../../mod/photos.php:1270 ../../mod/content.php:620
+#: ../../object/Item.php:105
 msgid "Private Message"
 msgstr "私人的新闻"
 
-#: ../../mod/photos.php:1266
+#: ../../mod/photos.php:1289
 msgid "View Full Size"
 msgstr "看全尺寸"
 
-#: ../../mod/photos.php:1340
+#: ../../mod/photos.php:1363
 msgid "Tags: "
 msgstr "标签："
 
-#: ../../mod/photos.php:1343
+#: ../../mod/photos.php:1366
 msgid "[Remove any tag]"
 msgstr "[删除任何标签]"
 
-#: ../../mod/photos.php:1353
+#: ../../mod/photos.php:1388
 msgid "Rotate CW (right)"
 msgstr ""
 
-#: ../../mod/photos.php:1354
+#: ../../mod/photos.php:1389
 msgid "Rotate CCW (left)"
 msgstr ""
 
-#: ../../mod/photos.php:1356
+#: ../../mod/photos.php:1391
 msgid "New album name"
 msgstr "新册名"
 
-#: ../../mod/photos.php:1359
+#: ../../mod/photos.php:1394
 msgid "Caption"
 msgstr "字幕"
 
-#: ../../mod/photos.php:1361
+#: ../../mod/photos.php:1396
 msgid "Add a Tag"
 msgstr "加标签"
 
-#: ../../mod/photos.php:1365
+#: ../../mod/photos.php:1400
 msgid ""
 "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr "例子：@zhang, @Zhang_San, @li@example.com, #Beijing, #ktv"
 
-#: ../../mod/photos.php:1385 ../../mod/content.php:667
-#: ../../object/Item.php:197
+#: ../../mod/photos.php:1420 ../../mod/content.php:684
+#: ../../object/Item.php:203
 msgid "I like this (toggle)"
 msgstr "我喜欢这(交替)"
 
-#: ../../mod/photos.php:1386 ../../mod/content.php:668
-#: ../../object/Item.php:198
+#: ../../mod/photos.php:1421 ../../mod/content.php:685
+#: ../../object/Item.php:204
 msgid "I don't like this (toggle)"
 msgstr "我不喜欢这(交替)"
 
-#: ../../mod/photos.php:1387 ../../include/conversation.php:966
+#: ../../mod/photos.php:1422 ../../include/conversation.php:1005
 msgid "Share"
 msgstr "分享"
 
-#: ../../mod/photos.php:1388 ../../mod/editpost.php:118
-#: ../../mod/content.php:482 ../../mod/content.php:848
-#: ../../mod/wallmessage.php:152 ../../mod/message.php:293
-#: ../../mod/message.php:481 ../../include/conversation.php:624
-#: ../../include/conversation.php:985 ../../object/Item.php:263
+#: ../../mod/photos.php:1423 ../../mod/editpost.php:121
+#: ../../mod/content.php:499 ../../mod/content.php:883
+#: ../../mod/wallmessage.php:152 ../../mod/message.php:300
+#: ../../mod/message.php:528 ../../include/conversation.php:645
+#: ../../include/conversation.php:1024 ../../object/Item.php:292
 msgid "Please wait"
 msgstr "请等一下"
 
-#: ../../mod/photos.php:1404 ../../mod/photos.php:1448
-#: ../../mod/photos.php:1520 ../../mod/content.php:690
-#: ../../object/Item.php:561
+#: ../../mod/photos.php:1439 ../../mod/photos.php:1483
+#: ../../mod/photos.php:1566 ../../mod/content.php:707
+#: ../../object/Item.php:606
 msgid "This is you"
 msgstr "这是你"
 
-#: ../../mod/photos.php:1406 ../../mod/photos.php:1450
-#: ../../mod/photos.php:1522 ../../mod/content.php:692 ../../boot.php:606
-#: ../../object/Item.php:260 ../../object/Item.php:563
+#: ../../mod/photos.php:1441 ../../mod/photos.php:1485
+#: ../../mod/photos.php:1568 ../../mod/content.php:709 ../../boot.php:641
+#: ../../object/Item.php:289 ../../object/Item.php:608
 msgid "Comment"
 msgstr "评论"
 
-#: ../../mod/photos.php:1408 ../../mod/photos.php:1452
-#: ../../mod/photos.php:1524 ../../mod/editpost.php:139
-#: ../../mod/content.php:702 ../../include/conversation.php:1003
-#: ../../object/Item.php:573
+#: ../../mod/photos.php:1443 ../../mod/photos.php:1487
+#: ../../mod/photos.php:1570 ../../mod/editpost.php:142
+#: ../../mod/content.php:719 ../../include/conversation.php:1042
+#: ../../object/Item.php:618
 msgid "Preview"
 msgstr "预演"
 
-#: ../../mod/photos.php:1492 ../../mod/content.php:439
-#: ../../mod/content.php:724 ../../mod/settings.php:606
-#: ../../mod/group.php:168 ../../mod/admin.php:696
-#: ../../include/conversation.php:569 ../../object/Item.php:118
+#: ../../mod/photos.php:1527 ../../mod/content.php:439
+#: ../../mod/content.php:741 ../../mod/settings.php:623
+#: ../../mod/group.php:171 ../../mod/admin.php:735
+#: ../../include/conversation.php:569 ../../object/Item.php:119
 msgid "Delete"
 msgstr "删除"
 
-#: ../../mod/photos.php:1605
+#: ../../mod/photos.php:1674
 msgid "View Album"
 msgstr "看照片册"
 
-#: ../../mod/photos.php:1614
+#: ../../mod/photos.php:1683
 msgid "Recent Photos"
 msgstr "最近的照片"
 
@@ -697,7 +697,7 @@ msgid "Community"
 msgstr "社会"
 
 #: ../../mod/community.php:61 ../../mod/community.php:86
-#: ../../mod/search.php:159 ../../mod/search.php:185
+#: ../../mod/search.php:162 ../../mod/search.php:188
 msgid "No results."
 msgstr "没有结果"
 
@@ -737,100 +737,100 @@ msgstr "没有安装的插件／应用"
 msgid "Item not found"
 msgstr "项目没找到"
 
-#: ../../mod/editpost.php:36
+#: ../../mod/editpost.php:39
 msgid "Edit post"
 msgstr "编辑文章"
 
-#: ../../mod/editpost.php:88 ../../include/conversation.php:952
+#: ../../mod/editpost.php:91 ../../include/conversation.php:991
 msgid "Post to Email"
 msgstr "电邮发布"
 
-#: ../../mod/editpost.php:103 ../../mod/content.php:711
-#: ../../mod/settings.php:605 ../../object/Item.php:108
+#: ../../mod/editpost.php:106 ../../mod/content.php:728
+#: ../../mod/settings.php:622 ../../object/Item.php:109
 msgid "Edit"
 msgstr "编辑"
 
-#: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
-#: ../../mod/message.php:291 ../../mod/message.php:478
-#: ../../include/conversation.php:967
+#: ../../mod/editpost.php:107 ../../mod/wallmessage.php:150
+#: ../../mod/message.php:298 ../../mod/message.php:525
+#: ../../include/conversation.php:1006
 msgid "Upload photo"
 msgstr "上传照片"
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:968
+#: ../../mod/editpost.php:108 ../../include/conversation.php:1007
 msgid "upload photo"
 msgstr "上传照片"
 
-#: ../../mod/editpost.php:106 ../../include/conversation.php:969
+#: ../../mod/editpost.php:109 ../../include/conversation.php:1008
 msgid "Attach file"
 msgstr "附上文件"
 
-#: ../../mod/editpost.php:107 ../../include/conversation.php:970
+#: ../../mod/editpost.php:110 ../../include/conversation.php:1009
 msgid "attach file"
 msgstr "附上文件"
 
-#: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151
-#: ../../mod/message.php:292 ../../mod/message.php:479
-#: ../../include/conversation.php:971
+#: ../../mod/editpost.php:111 ../../mod/wallmessage.php:151
+#: ../../mod/message.php:299 ../../mod/message.php:526
+#: ../../include/conversation.php:1010
 msgid "Insert web link"
 msgstr "插入网页环节"
 
-#: ../../mod/editpost.php:109 ../../include/conversation.php:972
+#: ../../mod/editpost.php:112 ../../include/conversation.php:1011
 msgid "web link"
 msgstr "网页环节"
 
-#: ../../mod/editpost.php:110 ../../include/conversation.php:973
+#: ../../mod/editpost.php:113 ../../include/conversation.php:1012
 msgid "Insert video link"
 msgstr "插入视频环节"
 
-#: ../../mod/editpost.php:111 ../../include/conversation.php:974
+#: ../../mod/editpost.php:114 ../../include/conversation.php:1013
 msgid "video link"
 msgstr "视频环节"
 
-#: ../../mod/editpost.php:112 ../../include/conversation.php:975
+#: ../../mod/editpost.php:115 ../../include/conversation.php:1014
 msgid "Insert audio link"
 msgstr "插入录音环节"
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:976
+#: ../../mod/editpost.php:116 ../../include/conversation.php:1015
 msgid "audio link"
 msgstr "录音环节"
 
-#: ../../mod/editpost.php:114 ../../include/conversation.php:977
+#: ../../mod/editpost.php:117 ../../include/conversation.php:1016
 msgid "Set your location"
 msgstr "设定您的位置"
 
-#: ../../mod/editpost.php:115 ../../include/conversation.php:978
+#: ../../mod/editpost.php:118 ../../include/conversation.php:1017
 msgid "set location"
 msgstr "指定位置"
 
-#: ../../mod/editpost.php:116 ../../include/conversation.php:979
+#: ../../mod/editpost.php:119 ../../include/conversation.php:1018
 msgid "Clear browser location"
 msgstr "清空浏览器位置"
 
-#: ../../mod/editpost.php:117 ../../include/conversation.php:980
+#: ../../mod/editpost.php:120 ../../include/conversation.php:1019
 msgid "clear location"
 msgstr "清理出位置"
 
-#: ../../mod/editpost.php:119 ../../include/conversation.php:986
+#: ../../mod/editpost.php:122 ../../include/conversation.php:1025
 msgid "Permission settings"
 msgstr "权设置"
 
-#: ../../mod/editpost.php:127 ../../include/conversation.php:995
+#: ../../mod/editpost.php:130 ../../include/conversation.php:1034
 msgid "CC: email addresses"
 msgstr "抄送: 电子邮件地址"
 
-#: ../../mod/editpost.php:128 ../../include/conversation.php:996
+#: ../../mod/editpost.php:131 ../../include/conversation.php:1035
 msgid "Public post"
 msgstr "公开的消息"
 
-#: ../../mod/editpost.php:131 ../../include/conversation.php:982
+#: ../../mod/editpost.php:134 ../../include/conversation.php:1021
 msgid "Set title"
 msgstr "指定标题"
 
-#: ../../mod/editpost.php:133 ../../include/conversation.php:984
+#: ../../mod/editpost.php:136 ../../include/conversation.php:1023
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../mod/editpost.php:134 ../../include/conversation.php:998
+#: ../../mod/editpost.php:137 ../../include/conversation.php:1037
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "比如: li@example.com, wang@example.com"
 
@@ -838,19 +838,19 @@ msgstr "比如: li@example.com, wang@example.com"
 msgid "This introduction has already been accepted."
 msgstr "这个介绍已经接受了。"
 
-#: ../../mod/dfrn_request.php:118 ../../mod/dfrn_request.php:512
+#: ../../mod/dfrn_request.php:118 ../../mod/dfrn_request.php:513
 msgid "Profile location is not valid or does not contain profile information."
 msgstr "简介位置失效或不包括简介信息。"
 
-#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:517
+#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:518
 msgid "Warning: profile location has no identifiable owner name."
 msgstr "警告：简介位置没有可设别的主名。"
 
-#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:519
+#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:520
 msgid "Warning: profile location has no profile photo."
 msgstr "警告：简介位置没有简介图。"
 
-#: ../../mod/dfrn_request.php:128 ../../mod/dfrn_request.php:522
+#: ../../mod/dfrn_request.php:128 ../../mod/dfrn_request.php:523
 #, php-format
 msgid "%d required parameter was not found at the given location"
 msgid_plural "%d required parameters were not found at the given location"
@@ -889,172 +889,172 @@ msgstr "无效找到物"
 msgid "Invalid email address."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:361
+#: ../../mod/dfrn_request.php:362
 msgid "This account has not been configured for email. Request failed."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:457
+#: ../../mod/dfrn_request.php:458
 msgid "Unable to resolve your name at the provided location."
 msgstr "不可疏解您的名字再输入的位置。"
 
-#: ../../mod/dfrn_request.php:470
+#: ../../mod/dfrn_request.php:471
 msgid "You have already introduced yourself here."
 msgstr "您已经自我介绍这儿。"
 
-#: ../../mod/dfrn_request.php:474
+#: ../../mod/dfrn_request.php:475
 #, php-format
 msgid "Apparently you are already friends with %s."
 msgstr "看上去您已经是%s的朋友。"
 
-#: ../../mod/dfrn_request.php:495
+#: ../../mod/dfrn_request.php:496
 msgid "Invalid profile URL."
 msgstr "无效的简介URL。"
 
-#: ../../mod/dfrn_request.php:501 ../../include/follow.php:27
+#: ../../mod/dfrn_request.php:502 ../../include/follow.php:27
 msgid "Disallowed profile URL."
 msgstr "不允许的简介地址."
 
-#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:123
+#: ../../mod/dfrn_request.php:571 ../../mod/contacts.php:124
 msgid "Failed to update contact record."
 msgstr "更新熟人记录失败了。"
 
-#: ../../mod/dfrn_request.php:591
+#: ../../mod/dfrn_request.php:592
 msgid "Your introduction has been sent."
 msgstr "您的介绍发布了。"
 
-#: ../../mod/dfrn_request.php:644
+#: ../../mod/dfrn_request.php:645
 msgid "Please login to confirm introduction."
 msgstr "请登记为确认介绍。"
 
-#: ../../mod/dfrn_request.php:658
+#: ../../mod/dfrn_request.php:659
 msgid ""
 "Incorrect identity currently logged in. Please login to "
 "<strong>this</strong> profile."
 msgstr "错误的用户登记者。请用<strong>这个</strong>用户。"
 
-#: ../../mod/dfrn_request.php:669
+#: ../../mod/dfrn_request.php:670
 msgid "Hide this contact"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:672
+#: ../../mod/dfrn_request.php:673
 #, php-format
 msgid "Welcome home %s."
 msgstr "欢迎%s。"
 
-#: ../../mod/dfrn_request.php:673
+#: ../../mod/dfrn_request.php:674
 #, php-format
 msgid "Please confirm your introduction/connection request to %s."
 msgstr "请确认您的介绍／联络要求给%s。"
 
-#: ../../mod/dfrn_request.php:674
+#: ../../mod/dfrn_request.php:675
 msgid "Confirm"
 msgstr "确认"
 
-#: ../../mod/dfrn_request.php:715 ../../include/items.php:3356
+#: ../../mod/dfrn_request.php:716 ../../include/items.php:3366
 msgid "[Name Withheld]"
 msgstr "[名字拒给]"
 
-#: ../../mod/dfrn_request.php:810
+#: ../../mod/dfrn_request.php:811
 msgid ""
 "Please enter your 'Identity Address' from one of the following supported "
 "communications networks:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:826
+#: ../../mod/dfrn_request.php:827
 msgid "<strike>Connect as an email follower</strike> (Coming soon)"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:828
+#: ../../mod/dfrn_request.php:829
 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 ""
 
-#: ../../mod/dfrn_request.php:831
+#: ../../mod/dfrn_request.php:832
 msgid "Friend/Connection Request"
 msgstr "朋友／联络要求。"
 
-#: ../../mod/dfrn_request.php:832
+#: ../../mod/dfrn_request.php:833
 msgid ""
 "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
 "testuser@identi.ca"
 msgstr "比如：jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"
 
-#: ../../mod/dfrn_request.php:833
+#: ../../mod/dfrn_request.php:834
 msgid "Please answer the following:"
 msgstr "请回答下述的："
 
-#: ../../mod/dfrn_request.php:834
+#: ../../mod/dfrn_request.php:835
 #, php-format
 msgid "Does %s know you?"
 msgstr "%s是否认识你？"
 
-#: ../../mod/dfrn_request.php:837
+#: ../../mod/dfrn_request.php:838
 msgid "Add a personal note:"
 msgstr "添加个人的便条"
 
-#: ../../mod/dfrn_request.php:839 ../../include/contact_selectors.php:76
+#: ../../mod/dfrn_request.php:840 ../../include/contact_selectors.php:76
 msgid "Friendica"
 msgstr "Friendica"
 
-#: ../../mod/dfrn_request.php:840
+#: ../../mod/dfrn_request.php:841
 msgid "StatusNet/Federated Social Web"
 msgstr "StatusNet／联合社会化网"
 
-#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:640
+#: ../../mod/dfrn_request.php:842 ../../mod/settings.php:681
 #: ../../include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr "Diaspora"
 
-#: ../../mod/dfrn_request.php:842
+#: ../../mod/dfrn_request.php:843
 #, php-format
 msgid ""
 " - please do not use this form.  Instead, enter %s into your Diaspora search"
 " bar."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:843
+#: ../../mod/dfrn_request.php:844
 msgid "Your Identity Address:"
 msgstr "您的同一个人地址："
 
-#: ../../mod/dfrn_request.php:846
+#: ../../mod/dfrn_request.php:847
 msgid "Submit Request"
 msgstr "提交要求"
 
-#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:137
+#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:140
 msgid "Account settings"
 msgstr "帐户配置"
 
-#: ../../mod/uexport.php:14 ../../mod/settings.php:35
+#: ../../mod/uexport.php:14 ../../mod/settings.php:40
 msgid "Display settings"
 msgstr ""
 
-#: ../../mod/uexport.php:20 ../../mod/settings.php:41
+#: ../../mod/uexport.php:20 ../../mod/settings.php:46
 msgid "Connector settings"
 msgstr "插销设置"
 
-#: ../../mod/uexport.php:25 ../../mod/settings.php:46
+#: ../../mod/uexport.php:25 ../../mod/settings.php:51
 msgid "Plugin settings"
 msgstr "插件设置"
 
-#: ../../mod/uexport.php:30 ../../mod/settings.php:51
+#: ../../mod/uexport.php:30 ../../mod/settings.php:56
 msgid "Connected apps"
 msgstr ""
 
-#: ../../mod/uexport.php:35 ../../mod/uexport.php:80 ../../mod/settings.php:56
+#: ../../mod/uexport.php:35 ../../mod/uexport.php:80 ../../mod/settings.php:61
 msgid "Export personal data"
 msgstr "出口私人信息"
 
-#: ../../mod/uexport.php:40 ../../mod/settings.php:61
+#: ../../mod/uexport.php:40 ../../mod/settings.php:66
 msgid "Remove account"
 msgstr ""
 
-#: ../../mod/uexport.php:48 ../../mod/settings.php:69
-#: ../../mod/newmember.php:22 ../../mod/admin.php:785 ../../mod/admin.php:990
+#: ../../mod/uexport.php:48 ../../mod/settings.php:74
+#: ../../mod/newmember.php:22 ../../mod/admin.php:824 ../../mod/admin.php:1029
 #: ../../addon/dav/friendica/layout.fnk.php:225
-#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:387
-#: ../../view/theme/diabook/theme.php:661 ../../include/nav.php:137
+#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537
+#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:140
 #: ../../addon.old/dav/friendica/layout.fnk.php:225
 #: ../../addon.old/mathjax/mathjax.php:36
 msgid "Settings"
@@ -1103,240 +1103,269 @@ msgid ""
 "or mysql."
 msgstr "您可能要手工地进口文件「database.sql」用phpmyadmin或mysql。"
 
-#: ../../mod/install.php:139 ../../mod/install.php:204
-#: ../../mod/install.php:488
+#: ../../mod/install.php:139 ../../mod/install.php:206
+#: ../../mod/install.php:506
 msgid "Please see the file \"INSTALL.txt\"."
 msgstr "请看文件「INSTALL.txt」"
 
-#: ../../mod/install.php:201
+#: ../../mod/install.php:203
 msgid "System check"
 msgstr "系统检测"
 
-#: ../../mod/install.php:206
+#: ../../mod/install.php:208
 msgid "Check again"
 msgstr "再检测"
 
-#: ../../mod/install.php:225
+#: ../../mod/install.php:227
 msgid "Database connection"
 msgstr "数据库接通"
 
-#: ../../mod/install.php:226
+#: ../../mod/install.php:228
 msgid ""
 "In order to install Friendica we need to know how to connect to your "
 "database."
 msgstr "为安装Friendica我们要知道怎么连接您的数据库。"
 
-#: ../../mod/install.php:227
+#: ../../mod/install.php:229
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
 msgstr "你有关于这些设置有问题的话，请给互联网托管服务或者网页管理联系。"
 
-#: ../../mod/install.php:228
+#: ../../mod/install.php:230
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
 msgstr "您下边指定的数据库应该已经存在。如果还没有，请继续前造成。"
 
-#: ../../mod/install.php:232
+#: ../../mod/install.php:234
 msgid "Database Server Name"
 msgstr "数据库服务器名"
 
-#: ../../mod/install.php:233
+#: ../../mod/install.php:235
 msgid "Database Login Name"
 msgstr "数据库登录名"
 
-#: ../../mod/install.php:234
+#: ../../mod/install.php:236
 msgid "Database Login Password"
 msgstr "数据库登录密码"
 
-#: ../../mod/install.php:235
+#: ../../mod/install.php:237
 msgid "Database Name"
 msgstr "数据库名字"
 
-#: ../../mod/install.php:236 ../../mod/install.php:275
+#: ../../mod/install.php:238 ../../mod/install.php:277
 msgid "Site administrator email address"
 msgstr "网站行政人员邮件地址"
 
-#: ../../mod/install.php:236 ../../mod/install.php:275
+#: ../../mod/install.php:238 ../../mod/install.php:277
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
 msgstr "您账户邮件地址必要符合这个为用网站处理仪表板"
 
-#: ../../mod/install.php:240 ../../mod/install.php:278
+#: ../../mod/install.php:242 ../../mod/install.php:280
 msgid "Please select a default timezone for your website"
 msgstr "请选择您网站的默认时区"
 
-#: ../../mod/install.php:265
+#: ../../mod/install.php:267
 msgid "Site settings"
 msgstr "网站设置"
 
-#: ../../mod/install.php:318
+#: ../../mod/install.php:320
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr "没找到命令行PHP在网服务器PATH。"
 
-#: ../../mod/install.php:319
+#: ../../mod/install.php:321
 msgid ""
 "If you don't have a command line version of PHP installed on server, you "
 "will not be able to run background polling via cron. See <a "
 "href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>"
 msgstr ""
 
-#: ../../mod/install.php:323
+#: ../../mod/install.php:325
 msgid "PHP executable path"
 msgstr "PHP可执行路径"
 
-#: ../../mod/install.php:323
+#: ../../mod/install.php:325
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr ""
 
-#: ../../mod/install.php:328
+#: ../../mod/install.php:330
 msgid "Command line PHP"
 msgstr "命令行PHP"
 
-#: ../../mod/install.php:337
+#: ../../mod/install.php:339
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr "您系统的命令行PHP没有能够「register_argc_argv」。"
 
-#: ../../mod/install.php:338
+#: ../../mod/install.php:340
 msgid "This is required for message delivery to work."
 msgstr "这必要为通信发布成功。"
 
-#: ../../mod/install.php:340
+#: ../../mod/install.php:342
 msgid "PHP register_argc_argv"
 msgstr ""
 
-#: ../../mod/install.php:361
+#: ../../mod/install.php:363
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr "错误：这系统的「register_argc_argv」子程序不能产生加密钥匙"
 
-#: ../../mod/install.php:362
+#: ../../mod/install.php:364
 msgid ""
 "If running under Windows, please see "
 "\"http://www.php.net/manual/en/openssl.installation.php\"."
 msgstr "如果您用Windows，请看「http://www.php.net/manual/en/openssl.installation.php」。"
 
-#: ../../mod/install.php:364
+#: ../../mod/install.php:366
 msgid "Generate encryption keys"
 msgstr "产生加密钥匙"
 
-#: ../../mod/install.php:371
+#: ../../mod/install.php:373
 msgid "libCurl PHP module"
 msgstr "libCurl PHP模块"
 
-#: ../../mod/install.php:372
+#: ../../mod/install.php:374
 msgid "GD graphics PHP module"
 msgstr "GD显示PHP模块"
 
-#: ../../mod/install.php:373
+#: ../../mod/install.php:375
 msgid "OpenSSL PHP module"
 msgstr "OpenSSL PHP模块"
 
-#: ../../mod/install.php:374
+#: ../../mod/install.php:376
 msgid "mysqli PHP module"
 msgstr "mysqli PHP模块"
 
-#: ../../mod/install.php:375
+#: ../../mod/install.php:377
 msgid "mb_string PHP module"
 msgstr "mb_string PHP模块"
 
-#: ../../mod/install.php:380 ../../mod/install.php:382
+#: ../../mod/install.php:382 ../../mod/install.php:384
 msgid "Apache mod_rewrite module"
 msgstr ""
 
-#: ../../mod/install.php:380
+#: ../../mod/install.php:382
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr "错误：Apache服务器的mod-rewrite模块是必要的可却不安装的。"
 
-#: ../../mod/install.php:388
+#: ../../mod/install.php:390
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "错误：libCurl PHP模块是必要的可却不安装的。"
 
-#: ../../mod/install.php:392
+#: ../../mod/install.php:394
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr "错误：GD显示PHP模块跟JPEG支持是必要的可却安装的。"
 
-#: ../../mod/install.php:396
+#: ../../mod/install.php:398
 msgid "Error: openssl PHP module required but not installed."
 msgstr "错误：openssl PHP模块是必要的可却不安装的。"
 
-#: ../../mod/install.php:400
+#: ../../mod/install.php:402
 msgid "Error: mysqli PHP module required but not installed."
 msgstr "错误：mysqli PHP模块是必要的可却不安装的。"
 
-#: ../../mod/install.php:404
+#: ../../mod/install.php:406
 msgid "Error: mb_string PHP module required but not installed."
 msgstr "错误：mbstring PHP模块必要可没安装的。"
 
-#: ../../mod/install.php:421
+#: ../../mod/install.php:423
 msgid ""
 "The web installer needs to be able to create a file called \".htconfig.php\""
 " in the top folder of your web server and it is unable to do so."
 msgstr "网页安装者要能造成叫「.htconfig.php」在网服务器主文件夹可却不能。"
 
-#: ../../mod/install.php:422
+#: ../../mod/install.php:424
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
 msgstr "这常常是一个权设置，因为网服务器可能不会写文件在文件夹－即使您会。"
 
-#: ../../mod/install.php:423
+#: ../../mod/install.php:425
 msgid ""
 "At the end of this procedure, we will give you a text to save in a file "
 "named .htconfig.php in your Friendica top folder."
 msgstr ""
 
-#: ../../mod/install.php:424
+#: ../../mod/install.php:426
 msgid ""
 "You can alternatively skip this procedure and perform a manual installation."
 " Please see the file \"INSTALL.txt\" for instructions."
 msgstr ""
 
-#: ../../mod/install.php:427
+#: ../../mod/install.php:429
 msgid ".htconfig.php is writable"
 msgstr ".htconfig.php是可写的"
 
 #: ../../mod/install.php:439
 msgid ""
-"Url rewrite in .htaccess is not working. Check your server configuration."
+"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
+msgstr ""
+
+#: ../../mod/install.php:440
+msgid ""
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory view/smarty3/ under the Friendica top level "
+"folder."
 msgstr ""
 
 #: ../../mod/install.php:441
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has"
+" write access to this folder."
+msgstr ""
+
+#: ../../mod/install.php:442
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"view/smarty3/ only--not the template files (.tpl) that it contains."
+msgstr ""
+
+#: ../../mod/install.php:445
+msgid "view/smarty3 is writable"
+msgstr ""
+
+#: ../../mod/install.php:457
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
+msgstr ""
+
+#: ../../mod/install.php:459
 msgid "Url rewrite is working"
 msgstr ""
 
-#: ../../mod/install.php:451
+#: ../../mod/install.php:469
 msgid ""
 "The database configuration file \".htconfig.php\" could not be written. "
 "Please use the enclosed text to create a configuration file in your web "
 "server root."
 msgstr "数据库设置文件「.htconfig.php」不能被写。请把包括的正文造成设置文件在网服务器子目录。"
 
-#: ../../mod/install.php:475
+#: ../../mod/install.php:493
 msgid "Errors encountered creating database tables."
 msgstr "造成数据库列表相遇错误。"
 
-#: ../../mod/install.php:486
+#: ../../mod/install.php:504
 msgid "<h1>What next</h1>"
 msgstr ""
 
-#: ../../mod/install.php:487
+#: ../../mod/install.php:505
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the "
 "poller."
 msgstr "重要：您要[手工地]准备安排的任务给喂器。"
 
 #: ../../mod/localtime.php:12 ../../include/event.php:11
-#: ../../include/bb2diaspora.php:390
+#: ../../include/bb2diaspora.php:393
 msgid "l F d, Y \\@ g:i A"
 msgstr "l F d, Y \\@ g:i A"
 
@@ -1402,7 +1431,7 @@ msgid "is interested in:"
 msgstr "感兴趣对："
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1214
+#: ../../include/contact_widgets.php:9 ../../boot.php:1288
 msgid "Connect"
 msgstr "连接"
 
@@ -1415,149 +1444,149 @@ msgid "Remote privacy information not available."
 msgstr "摇隐私信息无效"
 
 #: ../../mod/lockview.php:48
-#: ../../addon/remote_permissions/remote_permissions.php:123
+#: ../../addon/remote_permissions/remote_permissions.php:124
 msgid "Visible to:"
 msgstr "可见给："
 
-#: ../../mod/content.php:119 ../../mod/network.php:544
+#: ../../mod/content.php:119 ../../mod/network.php:594
 msgid "No such group"
 msgstr "没有这个组"
 
-#: ../../mod/content.php:130 ../../mod/network.php:555
+#: ../../mod/content.php:130 ../../mod/network.php:605
 msgid "Group is empty"
 msgstr "组没有成员"
 
-#: ../../mod/content.php:134 ../../mod/network.php:559
+#: ../../mod/content.php:134 ../../mod/network.php:609
 msgid "Group: "
 msgstr "组："
 
-#: ../../mod/content.php:438 ../../mod/content.php:723
-#: ../../include/conversation.php:568 ../../object/Item.php:117
+#: ../../mod/content.php:438 ../../mod/content.php:740
+#: ../../include/conversation.php:568 ../../object/Item.php:118
 msgid "Select"
 msgstr "选择"
 
-#: ../../mod/content.php:455 ../../mod/content.php:817
-#: ../../mod/content.php:818 ../../include/conversation.php:587
-#: ../../object/Item.php:229 ../../object/Item.php:230
+#: ../../mod/content.php:472 ../../mod/content.php:852
+#: ../../mod/content.php:853 ../../include/conversation.php:608
+#: ../../object/Item.php:257 ../../object/Item.php:258
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "看%s的简介@ %s"
 
-#: ../../mod/content.php:465 ../../mod/content.php:829
-#: ../../include/conversation.php:607 ../../object/Item.php:243
+#: ../../mod/content.php:482 ../../mod/content.php:864
+#: ../../include/conversation.php:628 ../../object/Item.php:271
 #, php-format
 msgid "%s from %s"
 msgstr "%s从%s"
 
-#: ../../mod/content.php:480 ../../include/conversation.php:622
+#: ../../mod/content.php:497 ../../include/conversation.php:643
 msgid "View in context"
 msgstr "看在上下文"
 
-#: ../../mod/content.php:586 ../../object/Item.php:282
+#: ../../mod/content.php:603 ../../object/Item.php:312
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d评论"
 
-#: ../../mod/content.php:588 ../../include/text.php:1446
-#: ../../object/Item.php:284 ../../object/Item.php:297
+#: ../../mod/content.php:605 ../../include/text.php:1502
+#: ../../object/Item.php:314 ../../object/Item.php:327
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] ""
 
-#: ../../mod/content.php:589 ../../addon/page/page.php:77
+#: ../../mod/content.php:606 ../../addon/page/page.php:77
 #: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119
-#: ../../include/contact_widgets.php:195 ../../boot.php:607
-#: ../../object/Item.php:285 ../../addon.old/page/page.php:77
+#: ../../include/contact_widgets.php:204 ../../boot.php:642
+#: ../../object/Item.php:315 ../../addon.old/page/page.php:77
 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119
 msgid "show more"
 msgstr "看多"
 
-#: ../../mod/content.php:667 ../../object/Item.php:197
+#: ../../mod/content.php:684 ../../object/Item.php:203
 msgid "like"
 msgstr "喜欢"
 
-#: ../../mod/content.php:668 ../../object/Item.php:198
+#: ../../mod/content.php:685 ../../object/Item.php:204
 msgid "dislike"
 msgstr "讨厌"
 
-#: ../../mod/content.php:670 ../../object/Item.php:200
+#: ../../mod/content.php:687 ../../object/Item.php:206
 msgid "Share this"
 msgstr "分享这个"
 
-#: ../../mod/content.php:670 ../../object/Item.php:200
+#: ../../mod/content.php:687 ../../object/Item.php:206
 msgid "share"
 msgstr "分享"
 
-#: ../../mod/content.php:694 ../../object/Item.php:565
+#: ../../mod/content.php:711 ../../object/Item.php:610
 msgid "Bold"
 msgstr ""
 
-#: ../../mod/content.php:695 ../../object/Item.php:566
+#: ../../mod/content.php:712 ../../object/Item.php:611
 msgid "Italic"
 msgstr ""
 
-#: ../../mod/content.php:696 ../../object/Item.php:567
+#: ../../mod/content.php:713 ../../object/Item.php:612
 msgid "Underline"
 msgstr ""
 
-#: ../../mod/content.php:697 ../../object/Item.php:568
+#: ../../mod/content.php:714 ../../object/Item.php:613
 msgid "Quote"
 msgstr ""
 
-#: ../../mod/content.php:698 ../../object/Item.php:569
+#: ../../mod/content.php:715 ../../object/Item.php:614
 msgid "Code"
 msgstr ""
 
-#: ../../mod/content.php:699 ../../object/Item.php:570
+#: ../../mod/content.php:716 ../../object/Item.php:615
 msgid "Image"
 msgstr ""
 
-#: ../../mod/content.php:700 ../../object/Item.php:571
+#: ../../mod/content.php:717 ../../object/Item.php:616
 msgid "Link"
 msgstr ""
 
-#: ../../mod/content.php:701 ../../object/Item.php:572
+#: ../../mod/content.php:718 ../../object/Item.php:617
 msgid "Video"
 msgstr ""
 
-#: ../../mod/content.php:736 ../../object/Item.php:181
+#: ../../mod/content.php:753 ../../object/Item.php:182
 msgid "add star"
 msgstr "加星"
 
-#: ../../mod/content.php:737 ../../object/Item.php:182
+#: ../../mod/content.php:754 ../../object/Item.php:183
 msgid "remove star"
 msgstr "消星"
 
-#: ../../mod/content.php:738 ../../object/Item.php:183
+#: ../../mod/content.php:755 ../../object/Item.php:184
 msgid "toggle star status"
 msgstr "转变星现状"
 
-#: ../../mod/content.php:741 ../../object/Item.php:186
+#: ../../mod/content.php:758 ../../object/Item.php:187
 msgid "starred"
 msgstr "被贴星"
 
-#: ../../mod/content.php:742 ../../object/Item.php:187
+#: ../../mod/content.php:759 ../../object/Item.php:192
 msgid "add tag"
 msgstr "加标签"
 
-#: ../../mod/content.php:746 ../../object/Item.php:121
+#: ../../mod/content.php:763 ../../object/Item.php:122
 msgid "save to folder"
 msgstr ""
 
-#: ../../mod/content.php:819 ../../object/Item.php:231
+#: ../../mod/content.php:854 ../../object/Item.php:259
 msgid "to"
 msgstr "至"
 
-#: ../../mod/content.php:820 ../../object/Item.php:233
+#: ../../mod/content.php:855 ../../object/Item.php:261
 msgid "Wall-to-Wall"
 msgstr "从墙到墙"
 
-#: ../../mod/content.php:821 ../../object/Item.php:234
+#: ../../mod/content.php:856 ../../object/Item.php:262
 msgid "via Wall-To-Wall:"
 msgstr "通过从墙到墙"
 
-#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:179
+#: ../../mod/home.php:34 ../../addon/communityhome/communityhome.php:189
 #: ../../addon.old/communityhome/communityhome.php:179
 #, php-format
 msgid "Welcome to %s"
@@ -1567,14 +1596,14 @@ msgstr "%s欢迎你"
 msgid "Invalid request identifier."
 msgstr "无效要求身份号。"
 
-#: ../../mod/notifications.php:35 ../../mod/notifications.php:164
-#: ../../mod/notifications.php:210
+#: ../../mod/notifications.php:35 ../../mod/notifications.php:165
+#: ../../mod/notifications.php:211
 msgid "Discard"
 msgstr "丢弃"
 
-#: ../../mod/notifications.php:51 ../../mod/notifications.php:163
-#: ../../mod/notifications.php:209 ../../mod/contacts.php:324
-#: ../../mod/contacts.php:378
+#: ../../mod/notifications.php:51 ../../mod/notifications.php:164
+#: ../../mod/notifications.php:210 ../../mod/contacts.php:325
+#: ../../mod/contacts.php:379
 msgid "Ignore"
 msgstr "忽视"
 
@@ -1586,21 +1615,21 @@ msgstr "系统"
 msgid "Network"
 msgstr "网络"
 
-#: ../../mod/notifications.php:88 ../../mod/network.php:407
+#: ../../mod/notifications.php:88 ../../mod/network.php:444
 msgid "Personal"
 msgstr "私人"
 
 #: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87
-#: ../../include/nav.php:77 ../../include/nav.php:115
+#: ../../include/nav.php:77 ../../include/nav.php:116
 msgid "Home"
 msgstr "主页"
 
-#: ../../mod/notifications.php:98 ../../include/nav.php:121
+#: ../../mod/notifications.php:98 ../../include/nav.php:122
 msgid "Introductions"
 msgstr "介绍"
 
-#: ../../mod/notifications.php:103 ../../mod/message.php:176
-#: ../../include/nav.php:128
+#: ../../mod/notifications.php:103 ../../mod/message.php:180
+#: ../../include/nav.php:129
 msgid "Messages"
 msgstr "消息"
 
@@ -1612,587 +1641,587 @@ msgstr "显示不理的要求"
 msgid "Hide Ignored Requests"
 msgstr "隐藏不理的要求"
 
-#: ../../mod/notifications.php:148 ../../mod/notifications.php:194
+#: ../../mod/notifications.php:149 ../../mod/notifications.php:195
 msgid "Notification type: "
 msgstr "通知种类："
 
-#: ../../mod/notifications.php:149
+#: ../../mod/notifications.php:150
 msgid "Friend Suggestion"
 msgstr "朋友建议"
 
-#: ../../mod/notifications.php:151
+#: ../../mod/notifications.php:152
 #, php-format
 msgid "suggested by %s"
 msgstr "由%s建议的"
 
-#: ../../mod/notifications.php:156 ../../mod/notifications.php:203
-#: ../../mod/contacts.php:384
+#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
+#: ../../mod/contacts.php:385
 msgid "Hide this contact from others"
 msgstr "隐藏这个熟人给别人"
 
-#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
+#: ../../mod/notifications.php:158 ../../mod/notifications.php:205
 msgid "Post a new friend activity"
-msgstr ""
+msgstr "表新朋友活动"
 
-#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
+#: ../../mod/notifications.php:158 ../../mod/notifications.php:205
 msgid "if applicable"
-msgstr ""
+msgstr "或适用"
 
-#: ../../mod/notifications.php:160 ../../mod/notifications.php:207
-#: ../../mod/admin.php:694
+#: ../../mod/notifications.php:161 ../../mod/notifications.php:208
+#: ../../mod/admin.php:733
 msgid "Approve"
 msgstr "批准"
 
-#: ../../mod/notifications.php:180
+#: ../../mod/notifications.php:181
 msgid "Claims to be known to you: "
 msgstr "声称被您认识："
 
-#: ../../mod/notifications.php:180
+#: ../../mod/notifications.php:181
 msgid "yes"
 msgstr "是"
 
-#: ../../mod/notifications.php:180
+#: ../../mod/notifications.php:181
 msgid "no"
 msgstr "否"
 
-#: ../../mod/notifications.php:187
+#: ../../mod/notifications.php:188
 msgid "Approve as: "
 msgstr "批准作为"
 
-#: ../../mod/notifications.php:188
+#: ../../mod/notifications.php:189
 msgid "Friend"
 msgstr "朋友"
 
-#: ../../mod/notifications.php:189
+#: ../../mod/notifications.php:190
 msgid "Sharer"
 msgstr "分享者"
 
-#: ../../mod/notifications.php:189
+#: ../../mod/notifications.php:190
 msgid "Fan/Admirer"
 msgstr "迷／赞赏者"
 
-#: ../../mod/notifications.php:195
+#: ../../mod/notifications.php:196
 msgid "Friend/Connect Request"
 msgstr "友谊／联络要求"
 
-#: ../../mod/notifications.php:195
+#: ../../mod/notifications.php:196
 msgid "New Follower"
 msgstr "新关注者："
 
-#: ../../mod/notifications.php:216
+#: ../../mod/notifications.php:217
 msgid "No introductions."
 msgstr "没有介绍。"
 
-#: ../../mod/notifications.php:219 ../../include/nav.php:122
+#: ../../mod/notifications.php:220 ../../include/nav.php:123
 msgid "Notifications"
 msgstr "通知"
 
-#: ../../mod/notifications.php:256 ../../mod/notifications.php:381
-#: ../../mod/notifications.php:468
+#: ../../mod/notifications.php:257 ../../mod/notifications.php:382
+#: ../../mod/notifications.php:469
 #, php-format
 msgid "%s liked %s's post"
 msgstr "%s喜欢了%s的消息"
 
-#: ../../mod/notifications.php:265 ../../mod/notifications.php:390
-#: ../../mod/notifications.php:477
+#: ../../mod/notifications.php:266 ../../mod/notifications.php:391
+#: ../../mod/notifications.php:478
 #, php-format
 msgid "%s disliked %s's post"
 msgstr "%s不喜欢了%s的消息"
 
-#: ../../mod/notifications.php:279 ../../mod/notifications.php:404
-#: ../../mod/notifications.php:491
+#: ../../mod/notifications.php:280 ../../mod/notifications.php:405
+#: ../../mod/notifications.php:492
 #, php-format
 msgid "%s is now friends with %s"
 msgstr "%s成为%s的朋友"
 
-#: ../../mod/notifications.php:286 ../../mod/notifications.php:411
+#: ../../mod/notifications.php:287 ../../mod/notifications.php:412
 #, php-format
 msgid "%s created a new post"
 msgstr "%s造成新文章"
 
-#: ../../mod/notifications.php:287 ../../mod/notifications.php:412
-#: ../../mod/notifications.php:500
+#: ../../mod/notifications.php:288 ../../mod/notifications.php:413
+#: ../../mod/notifications.php:501
 #, php-format
 msgid "%s commented on %s's post"
 msgstr "%s便条%s的文章"
 
-#: ../../mod/notifications.php:301
+#: ../../mod/notifications.php:302
 msgid "No more network notifications."
 msgstr "没有别的网络通信。"
 
-#: ../../mod/notifications.php:305
+#: ../../mod/notifications.php:306
 msgid "Network Notifications"
-msgstr ""
+msgstr "网络通知"
 
-#: ../../mod/notifications.php:331 ../../mod/notify.php:61
+#: ../../mod/notifications.php:332 ../../mod/notify.php:61
 msgid "No more system notifications."
-msgstr ""
+msgstr "没别系统通知。"
 
-#: ../../mod/notifications.php:335 ../../mod/notify.php:65
+#: ../../mod/notifications.php:336 ../../mod/notify.php:65
 msgid "System Notifications"
-msgstr ""
+msgstr "系统通知"
 
-#: ../../mod/notifications.php:426
+#: ../../mod/notifications.php:427
 msgid "No more personal notifications."
 msgstr "没有别的私人通信。"
 
-#: ../../mod/notifications.php:430
+#: ../../mod/notifications.php:431
 msgid "Personal Notifications"
-msgstr ""
+msgstr "私人通知"
 
-#: ../../mod/notifications.php:507
+#: ../../mod/notifications.php:508
 msgid "No more home notifications."
 msgstr "没有别的家通信。"
 
-#: ../../mod/notifications.php:511
+#: ../../mod/notifications.php:512
 msgid "Home Notifications"
-msgstr ""
+msgstr "主页通知"
 
-#: ../../mod/contacts.php:84 ../../mod/contacts.php:164
+#: ../../mod/contacts.php:85 ../../mod/contacts.php:165
 msgid "Could not access contact record."
 msgstr "用不了熟人记录。"
 
-#: ../../mod/contacts.php:98
+#: ../../mod/contacts.php:99
 msgid "Could not locate selected profile."
 msgstr "找不到选择的简介。"
 
-#: ../../mod/contacts.php:121
+#: ../../mod/contacts.php:122
 msgid "Contact updated."
 msgstr "熟人更新了。"
 
-#: ../../mod/contacts.php:186
+#: ../../mod/contacts.php:187
 msgid "Contact has been blocked"
 msgstr "熟人拦了"
 
-#: ../../mod/contacts.php:186
+#: ../../mod/contacts.php:187
 msgid "Contact has been unblocked"
 msgstr "熟人否拦了"
 
-#: ../../mod/contacts.php:200
+#: ../../mod/contacts.php:201
 msgid "Contact has been ignored"
 msgstr "熟人不理了"
 
-#: ../../mod/contacts.php:200
+#: ../../mod/contacts.php:201
 msgid "Contact has been unignored"
 msgstr "熟人否不理了"
 
-#: ../../mod/contacts.php:219
+#: ../../mod/contacts.php:220
 msgid "Contact has been archived"
 msgstr ""
 
-#: ../../mod/contacts.php:219
+#: ../../mod/contacts.php:220
 msgid "Contact has been unarchived"
 msgstr ""
 
-#: ../../mod/contacts.php:232
+#: ../../mod/contacts.php:233
 msgid "Contact has been removed."
 msgstr "熟人删除了。"
 
-#: ../../mod/contacts.php:266
+#: ../../mod/contacts.php:267
 #, php-format
 msgid "You are mutual friends with %s"
 msgstr "您和%s是共同朋友们"
 
-#: ../../mod/contacts.php:270
+#: ../../mod/contacts.php:271
 #, php-format
 msgid "You are sharing with %s"
 msgstr "您分享给%s"
 
-#: ../../mod/contacts.php:275
+#: ../../mod/contacts.php:276
 #, php-format
 msgid "%s is sharing with you"
 msgstr "%s给您分享"
 
-#: ../../mod/contacts.php:292
+#: ../../mod/contacts.php:293
 msgid "Private communications are not available for this contact."
 msgstr "没有私人的沟通跟这个熟人"
 
-#: ../../mod/contacts.php:295
+#: ../../mod/contacts.php:296
 msgid "Never"
 msgstr "从未"
 
-#: ../../mod/contacts.php:299
+#: ../../mod/contacts.php:300
 msgid "(Update was successful)"
 msgstr "(更新成功)"
 
-#: ../../mod/contacts.php:299
+#: ../../mod/contacts.php:300
 msgid "(Update was not successful)"
 msgstr "(更新不成功)"
 
-#: ../../mod/contacts.php:301
+#: ../../mod/contacts.php:302
 msgid "Suggest friends"
 msgstr "建议朋友们"
 
-#: ../../mod/contacts.php:305
+#: ../../mod/contacts.php:306
 #, php-format
 msgid "Network type: %s"
 msgstr "网络种类: %s"
 
-#: ../../mod/contacts.php:308 ../../include/contact_widgets.php:190
+#: ../../mod/contacts.php:309 ../../include/contact_widgets.php:199
 #, php-format
 msgid "%d contact in common"
 msgid_plural "%d contacts in common"
 msgstr[0] "%d共同熟人"
 
-#: ../../mod/contacts.php:313
+#: ../../mod/contacts.php:314
 msgid "View all contacts"
 msgstr "看所有的熟人"
 
-#: ../../mod/contacts.php:318 ../../mod/contacts.php:377
-#: ../../mod/admin.php:698
+#: ../../mod/contacts.php:319 ../../mod/contacts.php:378
+#: ../../mod/admin.php:737
 msgid "Unblock"
 msgstr "不拦"
 
-#: ../../mod/contacts.php:318 ../../mod/contacts.php:377
-#: ../../mod/admin.php:697
+#: ../../mod/contacts.php:319 ../../mod/contacts.php:378
+#: ../../mod/admin.php:736
 msgid "Block"
 msgstr "拦"
 
-#: ../../mod/contacts.php:321
+#: ../../mod/contacts.php:322
 msgid "Toggle Blocked status"
-msgstr ""
+msgstr "交替拦配置"
 
-#: ../../mod/contacts.php:324 ../../mod/contacts.php:378
+#: ../../mod/contacts.php:325 ../../mod/contacts.php:379
 msgid "Unignore"
 msgstr "停不理"
 
-#: ../../mod/contacts.php:327
+#: ../../mod/contacts.php:328
 msgid "Toggle Ignored status"
 msgstr ""
 
-#: ../../mod/contacts.php:331
+#: ../../mod/contacts.php:332
 msgid "Unarchive"
 msgstr ""
 
-#: ../../mod/contacts.php:331
+#: ../../mod/contacts.php:332
 msgid "Archive"
 msgstr ""
 
-#: ../../mod/contacts.php:334
+#: ../../mod/contacts.php:335
 msgid "Toggle Archive status"
 msgstr ""
 
-#: ../../mod/contacts.php:337
+#: ../../mod/contacts.php:338
 msgid "Repair"
 msgstr "维修"
 
-#: ../../mod/contacts.php:340
+#: ../../mod/contacts.php:341
 msgid "Advanced Contact Settings"
 msgstr ""
 
-#: ../../mod/contacts.php:346
+#: ../../mod/contacts.php:347
 msgid "Communications lost with this contact!"
 msgstr ""
 
-#: ../../mod/contacts.php:349
+#: ../../mod/contacts.php:350
 msgid "Contact Editor"
 msgstr "熟人编器"
 
-#: ../../mod/contacts.php:352
+#: ../../mod/contacts.php:353
 msgid "Profile Visibility"
 msgstr "简历可见量"
 
-#: ../../mod/contacts.php:353
+#: ../../mod/contacts.php:354
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "请选择简介您想给%s显示他安全地看您的简介的时候。"
 
-#: ../../mod/contacts.php:354
+#: ../../mod/contacts.php:355
 msgid "Contact Information / Notes"
 msgstr "熟人信息／便条"
 
-#: ../../mod/contacts.php:355
+#: ../../mod/contacts.php:356
 msgid "Edit contact notes"
 msgstr "编辑熟人便条"
 
-#: ../../mod/contacts.php:360 ../../mod/contacts.php:552
+#: ../../mod/contacts.php:361 ../../mod/contacts.php:553
 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "看%s的简介[%s]"
 
-#: ../../mod/contacts.php:361
+#: ../../mod/contacts.php:362
 msgid "Block/Unblock contact"
 msgstr "拦／否拦熟人"
 
-#: ../../mod/contacts.php:362
+#: ../../mod/contacts.php:363
 msgid "Ignore contact"
 msgstr "忽视熟人"
 
-#: ../../mod/contacts.php:363
+#: ../../mod/contacts.php:364
 msgid "Repair URL settings"
 msgstr "维修URL设置"
 
-#: ../../mod/contacts.php:364
+#: ../../mod/contacts.php:365
 msgid "View conversations"
 msgstr "看交流"
 
-#: ../../mod/contacts.php:366
+#: ../../mod/contacts.php:367
 msgid "Delete contact"
 msgstr "删除熟人"
 
-#: ../../mod/contacts.php:370
+#: ../../mod/contacts.php:371
 msgid "Last update:"
 msgstr "上个更新："
 
-#: ../../mod/contacts.php:372
+#: ../../mod/contacts.php:373
 msgid "Update public posts"
 msgstr "更新公开文章"
 
-#: ../../mod/contacts.php:374 ../../mod/admin.php:1170
+#: ../../mod/contacts.php:375 ../../mod/admin.php:1209
 msgid "Update now"
 msgstr "现在更新"
 
-#: ../../mod/contacts.php:381
+#: ../../mod/contacts.php:382
 msgid "Currently blocked"
 msgstr "现在拦的"
 
-#: ../../mod/contacts.php:382
+#: ../../mod/contacts.php:383
 msgid "Currently ignored"
 msgstr "现在不理的"
 
-#: ../../mod/contacts.php:383
+#: ../../mod/contacts.php:384
 msgid "Currently archived"
 msgstr ""
 
-#: ../../mod/contacts.php:384
+#: ../../mod/contacts.php:385
 msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr "回答／喜欢关您公开文章<strong>会</strong>还可见的"
 
-#: ../../mod/contacts.php:437
+#: ../../mod/contacts.php:438
 msgid "Suggestions"
 msgstr ""
 
-#: ../../mod/contacts.php:440
+#: ../../mod/contacts.php:441
 msgid "Suggest potential friends"
 msgstr ""
 
-#: ../../mod/contacts.php:443 ../../mod/group.php:191
+#: ../../mod/contacts.php:444 ../../mod/group.php:194
 msgid "All Contacts"
 msgstr "所有的熟人"
 
-#: ../../mod/contacts.php:446
+#: ../../mod/contacts.php:447
 msgid "Show all contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:449
+#: ../../mod/contacts.php:450
 msgid "Unblocked"
 msgstr ""
 
-#: ../../mod/contacts.php:452
+#: ../../mod/contacts.php:453
 msgid "Only show unblocked contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:456
+#: ../../mod/contacts.php:457
 msgid "Blocked"
 msgstr ""
 
-#: ../../mod/contacts.php:459
+#: ../../mod/contacts.php:460
 msgid "Only show blocked contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:463
+#: ../../mod/contacts.php:464
 msgid "Ignored"
 msgstr ""
 
-#: ../../mod/contacts.php:466
+#: ../../mod/contacts.php:467
 msgid "Only show ignored contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:470
+#: ../../mod/contacts.php:471
 msgid "Archived"
 msgstr ""
 
-#: ../../mod/contacts.php:473
+#: ../../mod/contacts.php:474
 msgid "Only show archived contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:477
+#: ../../mod/contacts.php:478
 msgid "Hidden"
 msgstr ""
 
-#: ../../mod/contacts.php:480
+#: ../../mod/contacts.php:481
 msgid "Only show hidden contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:528
+#: ../../mod/contacts.php:529
 msgid "Mutual Friendship"
 msgstr "共同友谊"
 
-#: ../../mod/contacts.php:532
+#: ../../mod/contacts.php:533
 msgid "is a fan of yours"
 msgstr "是您迷"
 
-#: ../../mod/contacts.php:536
+#: ../../mod/contacts.php:537
 msgid "you are a fan of"
 msgstr "你喜欢"
 
-#: ../../mod/contacts.php:553 ../../mod/nogroup.php:41
+#: ../../mod/contacts.php:554 ../../mod/nogroup.php:41
 msgid "Edit contact"
 msgstr "编熟人"
 
-#: ../../mod/contacts.php:574 ../../view/theme/diabook/theme.php:89
-#: ../../include/nav.php:139
+#: ../../mod/contacts.php:575 ../../view/theme/diabook/theme.php:89
+#: ../../include/nav.php:144
 msgid "Contacts"
 msgstr "熟人"
 
-#: ../../mod/contacts.php:578
+#: ../../mod/contacts.php:579
 msgid "Search your contacts"
 msgstr "搜索您的熟人"
 
-#: ../../mod/contacts.php:579 ../../mod/directory.php:59
+#: ../../mod/contacts.php:580 ../../mod/directory.php:59
+#: ../../addon/forumdirectory/forumdirectory.php:81
 msgid "Finding: "
 msgstr "找着："
 
-#: ../../mod/contacts.php:580 ../../mod/directory.php:61
+#: ../../mod/contacts.php:581 ../../mod/directory.php:61
+#: ../../addon/forumdirectory/forumdirectory.php:83
 #: ../../include/contact_widgets.php:33
 msgid "Find"
 msgstr "搜索"
 
-#: ../../mod/lostpass.php:16
+#: ../../mod/lostpass.php:17
 msgid "No valid account found."
 msgstr "找不到效的账户。"
 
-#: ../../mod/lostpass.php:32
+#: ../../mod/lostpass.php:33
 msgid "Password reset request issued. Check your email."
 msgstr "重设密码要求发布了。核对您的收件箱。"
 
-#: ../../mod/lostpass.php:43
+#: ../../mod/lostpass.php:44
 #, php-format
 msgid "Password reset requested at %s"
 msgstr "重设密码要求被发布%s"
 
-#: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
-#: ../../mod/register.php:91 ../../mod/register.php:145
-#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752
-#: ../../addon/facebook/facebook.php:702
-#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661
-#: ../../addon/public_server/public_server.php:62
-#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3365
-#: ../../boot.php:822 ../../addon.old/facebook/facebook.php:702
-#: ../../addon.old/facebook/facebook.php:1200
-#: ../../addon.old/fbpost/fbpost.php:661
-#: ../../addon.old/public_server/public_server.php:62
-#: ../../addon.old/testdrive/testdrive.php:67
-msgid "Administrator"
-msgstr "管理员"
-
-#: ../../mod/lostpass.php:65
+#: ../../mod/lostpass.php:66
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
 msgstr "要求确认不了。(您可能已经提交它。)重设密码失败了。"
 
-#: ../../mod/lostpass.php:83 ../../boot.php:961
+#: ../../mod/lostpass.php:84 ../../boot.php:1022
 msgid "Password Reset"
 msgstr "复位密码"
 
-#: ../../mod/lostpass.php:84
+#: ../../mod/lostpass.php:85
 msgid "Your password has been reset as requested."
 msgstr "您的密码被重设如要求的。"
 
-#: ../../mod/lostpass.php:85
+#: ../../mod/lostpass.php:86
 msgid "Your new password is"
 msgstr "你的新的密码是"
 
-#: ../../mod/lostpass.php:86
+#: ../../mod/lostpass.php:87
 msgid "Save or copy your new password - and then"
 msgstr "保存或复制新密码－之后"
 
-#: ../../mod/lostpass.php:87
+#: ../../mod/lostpass.php:88
 msgid "click here to login"
 msgstr "在这儿点击"
 
-#: ../../mod/lostpass.php:88
+#: ../../mod/lostpass.php:89
 msgid ""
 "Your password may be changed from the <em>Settings</em> page after "
 "successful login."
 msgstr "您的密码能被变化从<em>设置</em>页成功登记后。"
 
-#: ../../mod/lostpass.php:119
+#: ../../mod/lostpass.php:107
+#, php-format
+msgid "Your password has been changed at %s"
+msgstr ""
+
+#: ../../mod/lostpass.php:122
 msgid "Forgot your Password?"
 msgstr "忘记你的密码吗？"
 
-#: ../../mod/lostpass.php:120
+#: ../../mod/lostpass.php:123
 msgid ""
 "Enter your email address and submit to have your password reset. Then check "
 "your email for further instructions."
 msgstr "输入您的邮件地址和提交为重置密码。然后核对收件箱看别的说明。"
 
-#: ../../mod/lostpass.php:121
+#: ../../mod/lostpass.php:124
 msgid "Nickname or Email: "
 msgstr "昵称或邮件地址："
 
-#: ../../mod/lostpass.php:122
+#: ../../mod/lostpass.php:125
 msgid "Reset"
 msgstr "复位"
 
-#: ../../mod/settings.php:113
+#: ../../mod/settings.php:35
+msgid "Additional features"
+msgstr ""
+
+#: ../../mod/settings.php:118
 msgid "Missing some important data!"
 msgstr "有的重要信息失踪的！"
 
-#: ../../mod/settings.php:116 ../../mod/settings.php:569
+#: ../../mod/settings.php:121 ../../mod/settings.php:586
 msgid "Update"
 msgstr "更新"
 
-#: ../../mod/settings.php:221
+#: ../../mod/settings.php:227
 msgid "Failed to connect with email account using the settings provided."
 msgstr "不能连接电子邮件账户用输入的设置。"
 
-#: ../../mod/settings.php:226
+#: ../../mod/settings.php:232
 msgid "Email settings updated."
 msgstr "电子邮件设置更新了"
 
-#: ../../mod/settings.php:290
+#: ../../mod/settings.php:247
+msgid "Features updated"
+msgstr ""
+
+#: ../../mod/settings.php:307
 msgid "Passwords do not match. Password unchanged."
 msgstr "密码们不相配。密码没未改变的。"
 
-#: ../../mod/settings.php:295
+#: ../../mod/settings.php:312
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "空的密码禁止。密码没未改变的。"
 
-#: ../../mod/settings.php:306
+#: ../../mod/settings.php:323
 msgid "Password changed."
 msgstr "密码变化了。"
 
-#: ../../mod/settings.php:308
+#: ../../mod/settings.php:325
 msgid "Password update failed. Please try again."
 msgstr "密码更新失败了。请再试。"
 
-#: ../../mod/settings.php:373
+#: ../../mod/settings.php:390
 msgid " Please use a shorter name."
 msgstr "请用短一点个名。"
 
-#: ../../mod/settings.php:375
+#: ../../mod/settings.php:392
 msgid " Name too short."
 msgstr "名字太短。"
 
-#: ../../mod/settings.php:381
+#: ../../mod/settings.php:398
 msgid " Not valid email."
 msgstr " 电子邮件地址无效."
 
-#: ../../mod/settings.php:383
+#: ../../mod/settings.php:400
 msgid " Cannot change to that email."
 msgstr "不能变化到这个邮件地址。"
 
-#: ../../mod/settings.php:437
+#: ../../mod/settings.php:454
 msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr ""
 
-#: ../../mod/settings.php:441
+#: ../../mod/settings.php:458
 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr ""
 
-#: ../../mod/settings.php:471 ../../addon/facebook/facebook.php:495
-#: ../../addon/fbpost/fbpost.php:144
-#: ../../addon/remote_permissions/remote_permissions.php:204
+#: ../../mod/settings.php:488 ../../addon/facebook/facebook.php:497
+#: ../../addon/fbpost/fbpost.php:155
+#: ../../addon/remote_permissions/remote_permissions.php:205
 #: ../../addon/impressum/impressum.php:78
-#: ../../addon/openstreetmap/openstreetmap.php:80
-#: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105
-#: ../../addon/twitter/twitter.php:389
+#: ../../addon/openstreetmap/openstreetmap.php:104
+#: ../../addon/altpager/altpager.php:107 ../../addon/mathjax/mathjax.php:66
+#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:548
 #: ../../addon.old/facebook/facebook.php:495
 #: ../../addon.old/fbpost/fbpost.php:144
 #: ../../addon.old/impressum/impressum.php:78
@@ -2202,443 +2231,456 @@ msgstr ""
 msgid "Settings updated."
 msgstr "设置跟新了"
 
-#: ../../mod/settings.php:542 ../../mod/settings.php:568
-#: ../../mod/settings.php:604
+#: ../../mod/settings.php:559 ../../mod/settings.php:585
+#: ../../mod/settings.php:621
 msgid "Add application"
 msgstr "加入应用"
 
-#: ../../mod/settings.php:546 ../../mod/settings.php:572
-#: ../../addon/statusnet/statusnet.php:570
+#: ../../mod/settings.php:563 ../../mod/settings.php:589
+#: ../../addon/statusnet/statusnet.php:747
 #: ../../addon.old/statusnet/statusnet.php:570
 msgid "Consumer Key"
 msgstr "钥匙(Consumer Key)"
 
-#: ../../mod/settings.php:547 ../../mod/settings.php:573
-#: ../../addon/statusnet/statusnet.php:569
+#: ../../mod/settings.php:564 ../../mod/settings.php:590
+#: ../../addon/statusnet/statusnet.php:746
 #: ../../addon.old/statusnet/statusnet.php:569
 msgid "Consumer Secret"
 msgstr "密码(Consumer Secret)"
 
-#: ../../mod/settings.php:548 ../../mod/settings.php:574
+#: ../../mod/settings.php:565 ../../mod/settings.php:591
 msgid "Redirect"
 msgstr "重定向"
 
-#: ../../mod/settings.php:549 ../../mod/settings.php:575
+#: ../../mod/settings.php:566 ../../mod/settings.php:592
 msgid "Icon url"
 msgstr "图符URL"
 
-#: ../../mod/settings.php:560
+#: ../../mod/settings.php:577
 msgid "You can't edit this application."
 msgstr "您不能编辑这个应用。"
 
-#: ../../mod/settings.php:603
+#: ../../mod/settings.php:620
 msgid "Connected Apps"
 msgstr "连接着应用"
 
-#: ../../mod/settings.php:607
+#: ../../mod/settings.php:624
 msgid "Client key starts with"
 msgstr "客户钥匙头字是"
 
-#: ../../mod/settings.php:608
+#: ../../mod/settings.php:625
 msgid "No name"
 msgstr "无名"
 
-#: ../../mod/settings.php:609
+#: ../../mod/settings.php:626
 msgid "Remove authorization"
 msgstr "撤消权能"
 
-#: ../../mod/settings.php:620
+#: ../../mod/settings.php:638
 msgid "No Plugin settings configured"
 msgstr "没插件设置配置了"
 
-#: ../../mod/settings.php:628 ../../addon/widgets/widgets.php:123
+#: ../../mod/settings.php:646 ../../addon/widgets/widgets.php:124
 #: ../../addon.old/widgets/widgets.php:123
 msgid "Plugin Settings"
 msgstr "插件设置"
 
-#: ../../mod/settings.php:640 ../../mod/settings.php:641
+#: ../../mod/settings.php:660
+msgid "Off"
+msgstr ""
+
+#: ../../mod/settings.php:660
+msgid "On"
+msgstr ""
+
+#: ../../mod/settings.php:668
+msgid "Additional Features"
+msgstr ""
+
+#: ../../mod/settings.php:681 ../../mod/settings.php:682
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr "包括的支持为%s连通性是%s"
 
-#: ../../mod/settings.php:640 ../../mod/settings.php:641
+#: ../../mod/settings.php:681 ../../mod/settings.php:682
 msgid "enabled"
 msgstr "能够做的"
 
-#: ../../mod/settings.php:640 ../../mod/settings.php:641
+#: ../../mod/settings.php:681 ../../mod/settings.php:682
 msgid "disabled"
 msgstr "使不能用"
 
-#: ../../mod/settings.php:641
+#: ../../mod/settings.php:682
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: ../../mod/settings.php:673
+#: ../../mod/settings.php:714
 msgid "Email access is disabled on this site."
 msgstr "这个网站没有邮件使用权"
 
-#: ../../mod/settings.php:679
+#: ../../mod/settings.php:721
 msgid "Connector Settings"
 msgstr "连接器设置"
 
-#: ../../mod/settings.php:684
+#: ../../mod/settings.php:726
 msgid "Email/Mailbox Setup"
 msgstr "邮件收件箱设置"
 
-#: ../../mod/settings.php:685
+#: ../../mod/settings.php:727
 msgid ""
 "If you wish to communicate with email contacts using this service "
 "(optional), please specify how to connect to your mailbox."
 msgstr "如果您想用这股服务(可选的)跟邮件熟人交流，请指定怎么连通您的收件箱。"
 
-#: ../../mod/settings.php:686
+#: ../../mod/settings.php:728
 msgid "Last successful email check:"
 msgstr "上个成功收件箱检查："
 
-#: ../../mod/settings.php:688
+#: ../../mod/settings.php:730
 msgid "IMAP server name:"
 msgstr "IMAP服务器名字："
 
-#: ../../mod/settings.php:689
+#: ../../mod/settings.php:731
 msgid "IMAP port:"
 msgstr "IMAP服务器端口："
 
-#: ../../mod/settings.php:690
+#: ../../mod/settings.php:732
 msgid "Security:"
 msgstr "安全："
 
-#: ../../mod/settings.php:690 ../../mod/settings.php:695
+#: ../../mod/settings.php:732 ../../mod/settings.php:737
+#: ../../addon/fbpost/fbpost.php:255 ../../addon/fbpost/fbpost.php:257
 #: ../../addon/dav/common/wdcal_edit.inc.php:191
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:191
 msgid "None"
 msgstr "没有"
 
-#: ../../mod/settings.php:691
+#: ../../mod/settings.php:733
 msgid "Email login name:"
 msgstr "邮件登记名："
 
-#: ../../mod/settings.php:692
+#: ../../mod/settings.php:734
 msgid "Email password:"
 msgstr "邮件密码："
 
-#: ../../mod/settings.php:693
+#: ../../mod/settings.php:735
 msgid "Reply-to address:"
 msgstr "回答地址："
 
-#: ../../mod/settings.php:694
+#: ../../mod/settings.php:736
 msgid "Send public posts to all email contacts:"
 msgstr "发公开的文章给所有的邮件熟人："
 
-#: ../../mod/settings.php:695
+#: ../../mod/settings.php:737
 msgid "Action after import:"
 msgstr ""
 
-#: ../../mod/settings.php:695
+#: ../../mod/settings.php:737
 msgid "Mark as seen"
 msgstr ""
 
-#: ../../mod/settings.php:695
+#: ../../mod/settings.php:737
 msgid "Move to folder"
 msgstr ""
 
-#: ../../mod/settings.php:696
+#: ../../mod/settings.php:738
 msgid "Move to folder:"
 msgstr ""
 
-#: ../../mod/settings.php:727 ../../mod/admin.php:402
+#: ../../mod/settings.php:769 ../../mod/admin.php:420
 msgid "No special theme for mobile devices"
 msgstr ""
 
-#: ../../mod/settings.php:767
+#: ../../mod/settings.php:809
 msgid "Display Settings"
 msgstr ""
 
-#: ../../mod/settings.php:773 ../../mod/settings.php:784
+#: ../../mod/settings.php:815 ../../mod/settings.php:826
 msgid "Display Theme:"
 msgstr "显示主题："
 
-#: ../../mod/settings.php:774
+#: ../../mod/settings.php:816
 msgid "Mobile Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:775
+#: ../../mod/settings.php:817
 msgid "Update browser every xx seconds"
 msgstr "更新游览器每XX秒"
 
-#: ../../mod/settings.php:775
+#: ../../mod/settings.php:817
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "最小10秒，没有上限"
 
-#: ../../mod/settings.php:776
+#: ../../mod/settings.php:818
 msgid "Number of items to display per page:"
 msgstr ""
 
-#: ../../mod/settings.php:776
+#: ../../mod/settings.php:818
 msgid "Maximum of 100 items"
 msgstr ""
 
-#: ../../mod/settings.php:777
+#: ../../mod/settings.php:819
 msgid "Don't show emoticons"
 msgstr ""
 
-#: ../../mod/settings.php:853
+#: ../../mod/settings.php:895
 msgid "Normal Account Page"
 msgstr ""
 
-#: ../../mod/settings.php:854
+#: ../../mod/settings.php:896
 msgid "This account is a normal personal profile"
 msgstr "这个帐户是正常私人简介"
 
-#: ../../mod/settings.php:857
+#: ../../mod/settings.php:899
 msgid "Soapbox Page"
 msgstr ""
 
-#: ../../mod/settings.php:858
+#: ../../mod/settings.php:900
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr "自动批准所有联络／友谊要求当只看的迷"
 
-#: ../../mod/settings.php:861
+#: ../../mod/settings.php:903
 msgid "Community Forum/Celebrity Account"
 msgstr ""
 
-#: ../../mod/settings.php:862
+#: ../../mod/settings.php:904
 msgid ""
 "Automatically approve all connection/friend requests as read-write fans"
 msgstr "自动批准所有联络／友谊要求当看写的迷"
 
-#: ../../mod/settings.php:865
+#: ../../mod/settings.php:907
 msgid "Automatic Friend Page"
 msgstr ""
 
-#: ../../mod/settings.php:866
+#: ../../mod/settings.php:908
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr "自动批准所有联络／友谊要求当朋友"
 
-#: ../../mod/settings.php:869
+#: ../../mod/settings.php:911
 msgid "Private Forum [Experimental]"
 msgstr ""
 
-#: ../../mod/settings.php:870
+#: ../../mod/settings.php:912
 msgid "Private forum - approved members only"
 msgstr ""
 
-#: ../../mod/settings.php:882
+#: ../../mod/settings.php:924
 msgid "OpenID:"
 msgstr "OpenID:"
 
-#: ../../mod/settings.php:882
+#: ../../mod/settings.php:924
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr "(可选的)许这个OpenID这个账户登记。"
 
-#: ../../mod/settings.php:892
+#: ../../mod/settings.php:934
 msgid "Publish your default profile in your local site directory?"
 msgstr "出版您默认简介在您当地的网站目录？"
 
-#: ../../mod/settings.php:898
+#: ../../mod/settings.php:940
 msgid "Publish your default profile in the global social directory?"
 msgstr "出版您默认简介在综合社会目录？"
 
-#: ../../mod/settings.php:906
+#: ../../mod/settings.php:948
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr "藏起来  发现您的熟人／朋友单不让这个简介看着看？\n "
 
-#: ../../mod/settings.php:910
+#: ../../mod/settings.php:952
 msgid "Hide your profile details from unknown viewers?"
 msgstr "使简介信息给陌生的看着看不了？"
 
-#: ../../mod/settings.php:915
+#: ../../mod/settings.php:957
 msgid "Allow friends to post to your profile page?"
 msgstr "允许朋友们贴文章在您的简介页？"
 
-#: ../../mod/settings.php:921
+#: ../../mod/settings.php:963
 msgid "Allow friends to tag your posts?"
 msgstr "允许朋友们标签您的文章？"
 
-#: ../../mod/settings.php:927
+#: ../../mod/settings.php:969
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "允许我们建议您潜力朋友给新成员？"
 
-#: ../../mod/settings.php:933
+#: ../../mod/settings.php:975
 msgid "Permit unknown people to send you private mail?"
 msgstr ""
 
-#: ../../mod/settings.php:941
+#: ../../mod/settings.php:983
 msgid "Profile is <strong>not published</strong>."
 msgstr "简介是<strong>没出版</strong>"
 
-#: ../../mod/settings.php:944 ../../mod/profile_photo.php:248
+#: ../../mod/settings.php:986 ../../mod/profile_photo.php:248
 msgid "or"
 msgstr "或者"
 
-#: ../../mod/settings.php:949
+#: ../../mod/settings.php:991
 msgid "Your Identity Address is"
 msgstr "您的同一个人地址是"
 
-#: ../../mod/settings.php:960
+#: ../../mod/settings.php:1002
 msgid "Automatically expire posts after this many days:"
-msgstr ""
+msgstr "自动地过期文章这数天："
 
-#: ../../mod/settings.php:960
+#: ../../mod/settings.php:1002
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr "如果空的，文章不会过期。过期的文章被删除"
 
-#: ../../mod/settings.php:961
+#: ../../mod/settings.php:1003
 msgid "Advanced expiration settings"
 msgstr "先进的过期设置"
 
-#: ../../mod/settings.php:962
+#: ../../mod/settings.php:1004
 msgid "Advanced Expiration"
 msgstr "先进的过期"
 
-#: ../../mod/settings.php:963
+#: ../../mod/settings.php:1005
 msgid "Expire posts:"
 msgstr "把文章过期："
 
-#: ../../mod/settings.php:964
+#: ../../mod/settings.php:1006
 msgid "Expire personal notes:"
 msgstr "把私人便条过期："
 
-#: ../../mod/settings.php:965
+#: ../../mod/settings.php:1007
 msgid "Expire starred posts:"
 msgstr "把星的文章过期："
 
-#: ../../mod/settings.php:966
+#: ../../mod/settings.php:1008
 msgid "Expire photos:"
 msgstr "把照片过期："
 
-#: ../../mod/settings.php:967
+#: ../../mod/settings.php:1009
 msgid "Only expire posts by others:"
 msgstr ""
 
-#: ../../mod/settings.php:974
+#: ../../mod/settings.php:1016
 msgid "Account Settings"
 msgstr "帐户设置"
 
-#: ../../mod/settings.php:982
+#: ../../mod/settings.php:1024
 msgid "Password Settings"
 msgstr "密码设置"
 
-#: ../../mod/settings.php:983
+#: ../../mod/settings.php:1025
 msgid "New Password:"
 msgstr "新密码："
 
-#: ../../mod/settings.php:984
+#: ../../mod/settings.php:1026
 msgid "Confirm:"
 msgstr "确认："
 
-#: ../../mod/settings.php:984
+#: ../../mod/settings.php:1026
 msgid "Leave password fields blank unless changing"
 msgstr "非变化留空密码栏"
 
-#: ../../mod/settings.php:988
+#: ../../mod/settings.php:1030
 msgid "Basic Settings"
 msgstr "基础设置"
 
-#: ../../mod/settings.php:989 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:1031 ../../include/profile_advanced.php:15
 msgid "Full Name:"
 msgstr "全名："
 
-#: ../../mod/settings.php:990
+#: ../../mod/settings.php:1032
 msgid "Email Address:"
 msgstr "电子邮件地址:"
 
-#: ../../mod/settings.php:991
+#: ../../mod/settings.php:1033
 msgid "Your Timezone:"
 msgstr "您的时区："
 
-#: ../../mod/settings.php:992
+#: ../../mod/settings.php:1034
 msgid "Default Post Location:"
 msgstr "默认文章位置："
 
-#: ../../mod/settings.php:993
+#: ../../mod/settings.php:1035
 msgid "Use Browser Location:"
 msgstr "用游览器位置："
 
-#: ../../mod/settings.php:996
+#: ../../mod/settings.php:1038
 msgid "Security and Privacy Settings"
 msgstr "安全和隐私设置"
 
-#: ../../mod/settings.php:998
+#: ../../mod/settings.php:1040
 msgid "Maximum Friend Requests/Day:"
 msgstr "最多友谊要求个天："
 
-#: ../../mod/settings.php:998 ../../mod/settings.php:1017
+#: ../../mod/settings.php:1040 ../../mod/settings.php:1059
 msgid "(to prevent spam abuse)"
 msgstr "(为防止垃圾邮件滥用)"
 
-#: ../../mod/settings.php:999
+#: ../../mod/settings.php:1041
 msgid "Default Post Permissions"
 msgstr "默认文章准许"
 
-#: ../../mod/settings.php:1000
+#: ../../mod/settings.php:1042
 msgid "(click to open/close)"
 msgstr "（点击为打开/关闭）"
 
-#: ../../mod/settings.php:1017
+#: ../../mod/settings.php:1059
 msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../mod/settings.php:1020
+#: ../../mod/settings.php:1062
 msgid "Notification Settings"
 msgstr "消息设置"
 
-#: ../../mod/settings.php:1021
+#: ../../mod/settings.php:1063
 msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../mod/settings.php:1022
+#: ../../mod/settings.php:1064
 msgid "accepting a friend request"
 msgstr ""
 
-#: ../../mod/settings.php:1023
+#: ../../mod/settings.php:1065
 msgid "joining a forum/community"
 msgstr ""
 
-#: ../../mod/settings.php:1024
+#: ../../mod/settings.php:1066
 msgid "making an <em>interesting</em> profile change"
 msgstr ""
 
-#: ../../mod/settings.php:1025
+#: ../../mod/settings.php:1067
 msgid "Send a notification email when:"
 msgstr "发一个消息要是："
 
-#: ../../mod/settings.php:1026
+#: ../../mod/settings.php:1068
 msgid "You receive an introduction"
 msgstr "你受到一个介绍"
 
-#: ../../mod/settings.php:1027
+#: ../../mod/settings.php:1069
 msgid "Your introductions are confirmed"
 msgstr "你的介绍确认了"
 
-#: ../../mod/settings.php:1028
+#: ../../mod/settings.php:1070
 msgid "Someone writes on your profile wall"
 msgstr "某人写在你的简历墙"
 
-#: ../../mod/settings.php:1029
+#: ../../mod/settings.php:1071
 msgid "Someone writes a followup comment"
 msgstr "某人写一个后续的评论"
 
-#: ../../mod/settings.php:1030
+#: ../../mod/settings.php:1072
 msgid "You receive a private message"
 msgstr "你受到一个私消息"
 
-#: ../../mod/settings.php:1031
+#: ../../mod/settings.php:1073
 msgid "You receive a friend suggestion"
 msgstr "你受到一个朋友建议"
 
-#: ../../mod/settings.php:1032
+#: ../../mod/settings.php:1074
 msgid "You are tagged in a post"
 msgstr "你被在新闻标签"
 
-#: ../../mod/settings.php:1033
+#: ../../mod/settings.php:1075
 msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: ../../mod/settings.php:1036
+#: ../../mod/settings.php:1078
 msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1037
+#: ../../mod/settings.php:1079
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
@@ -2650,7 +2692,7 @@ msgstr "管理身份或页"
 msgid ""
 "Toggle between different identities or community/group pages which share "
 "your account details or which you have been granted \"manage\" permissions"
-msgstr ""
+msgstr "交替不同同一人或社会／组页合用您的账户或给您「管理」批准"
 
 #: ../../mod/manage.php:99
 msgid "Select an identity to manage: "
@@ -2660,95 +2702,96 @@ msgstr "选择同一个人管理："
 msgid "Search Results For:"
 msgstr "搜索结果为："
 
-#: ../../mod/network.php:221 ../../mod/search.php:18
+#: ../../mod/network.php:224 ../../mod/search.php:21
 msgid "Remove term"
 msgstr "删除关键字"
 
-#: ../../mod/network.php:230 ../../mod/search.php:27
+#: ../../mod/network.php:233 ../../mod/search.php:30
+#: ../../include/features.php:41
 msgid "Saved Searches"
 msgstr "保存的搜索"
 
-#: ../../mod/network.php:231 ../../include/group.php:275
+#: ../../mod/network.php:234 ../../include/group.php:275
 msgid "add"
 msgstr "添加"
 
-#: ../../mod/network.php:394
+#: ../../mod/network.php:397
 msgid "Commented Order"
 msgstr "评论时间顺序"
 
-#: ../../mod/network.php:397
+#: ../../mod/network.php:400
 msgid "Sort by Comment Date"
 msgstr ""
 
-#: ../../mod/network.php:400
+#: ../../mod/network.php:403
 msgid "Posted Order"
 msgstr "贴时间顺序"
 
-#: ../../mod/network.php:403
+#: ../../mod/network.php:406
 msgid "Sort by Post Date"
 msgstr ""
 
-#: ../../mod/network.php:410
+#: ../../mod/network.php:447
 msgid "Posts that mention or involve you"
 msgstr ""
 
-#: ../../mod/network.php:413
+#: ../../mod/network.php:453
 msgid "New"
 msgstr "新"
 
-#: ../../mod/network.php:416
+#: ../../mod/network.php:456
 msgid "Activity Stream - by date"
 msgstr ""
 
-#: ../../mod/network.php:419
-msgid "Starred"
-msgstr "被星"
-
-#: ../../mod/network.php:422
-msgid "Favourite Posts"
-msgstr ""
-
-#: ../../mod/network.php:425
+#: ../../mod/network.php:462
 msgid "Shared Links"
 msgstr ""
 
-#: ../../mod/network.php:428
+#: ../../mod/network.php:465
 msgid "Interesting Links"
 msgstr ""
 
-#: ../../mod/network.php:496
+#: ../../mod/network.php:471
+msgid "Starred"
+msgstr "被星"
+
+#: ../../mod/network.php:474
+msgid "Favourite Posts"
+msgstr ""
+
+#: ../../mod/network.php:546
 #, php-format
 msgid "Warning: This group contains %s member from an insecure network."
 msgid_plural ""
 "Warning: This group contains %s members from an insecure network."
 msgstr[0] "警告：这个组包括%s成员从不安全网络。"
 
-#: ../../mod/network.php:499
+#: ../../mod/network.php:549
 msgid "Private messages to this group are at risk of public disclosure."
 msgstr "私人通信给这组回被公开。"
 
-#: ../../mod/network.php:569
+#: ../../mod/network.php:619
 msgid "Contact: "
 msgstr "熟人："
 
-#: ../../mod/network.php:571
+#: ../../mod/network.php:621
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr "私人通信给这个人回被公开。"
 
-#: ../../mod/network.php:576
+#: ../../mod/network.php:626
 msgid "Invalid contact."
 msgstr "无效熟人。"
 
-#: ../../mod/notes.php:44 ../../boot.php:1753
+#: ../../mod/notes.php:44 ../../boot.php:1836
 msgid "Personal Notes"
 msgstr "私人便条"
 
-#: ../../mod/notes.php:63 ../../mod/filer.php:30
-#: ../../addon/facebook/facebook.php:770
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:263
-#: ../../addon/fbpost/fbpost.php:267
+#: ../../mod/notes.php:63 ../../mod/filer.php:31
+#: ../../addon/facebook/facebook.php:772
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:354
+#: ../../addon/fbpost/fbpost.php:322
 #: ../../addon/dav/friendica/layout.fnk.php:441
-#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:688
+#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:741
 #: ../../addon.old/facebook/facebook.php:770
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:263
 #: ../../addon.old/fbpost/fbpost.php:267
@@ -2757,7 +2800,7 @@ msgstr "私人便条"
 msgid "Save"
 msgstr "保存"
 
-#: ../../mod/uimport.php:50 ../../mod/register.php:190
+#: ../../mod/uimport.php:50 ../../mod/register.php:192
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
@@ -2772,10 +2815,20 @@ msgid "Move account"
 msgstr ""
 
 #: ../../mod/uimport.php:67
+msgid "You can import an account from another Friendica server."
+msgstr ""
+
+#: ../../mod/uimport.php:68
 msgid ""
-"You can import an account from another Friendica server. <br>\r\n"
-"                            You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here.<br>\r\n"
-"                            <b>This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from diaspora"
+"You need to export your account from the old server and upload it here. We "
+"will recreate your old account here with all your contacts. We will try also"
+" to inform your friends that you moved here."
+msgstr ""
+
+#: ../../mod/uimport.php:69
+msgid ""
+"This feature is experimental. We can't import contacts from the OStatus "
+"network (statusnet/identi.ca) or from Diaspora"
 msgstr ""
 
 #: ../../mod/uimport.php:70
@@ -2793,7 +2846,7 @@ msgstr ""
 msgid "Number of daily wall messages for %s exceeded. Message failed."
 msgstr ""
 
-#: ../../mod/wallmessage.php:56 ../../mod/message.php:59
+#: ../../mod/wallmessage.php:56 ../../mod/message.php:63
 msgid "No recipient selected."
 msgstr "没有选择的接受者。"
 
@@ -2801,15 +2854,15 @@ msgstr "没有选择的接受者。"
 msgid "Unable to check your home location."
 msgstr ""
 
-#: ../../mod/wallmessage.php:62 ../../mod/message.php:66
+#: ../../mod/wallmessage.php:62 ../../mod/message.php:70
 msgid "Message could not be sent."
 msgstr "消息发不了。"
 
-#: ../../mod/wallmessage.php:65 ../../mod/message.php:69
+#: ../../mod/wallmessage.php:65 ../../mod/message.php:73
 msgid "Message collection failure."
 msgstr "通信受到错误。"
 
-#: ../../mod/wallmessage.php:68 ../../mod/message.php:72
+#: ../../mod/wallmessage.php:68 ../../mod/message.php:76
 msgid "Message sent."
 msgstr "消息发了"
 
@@ -2818,12 +2871,13 @@ msgid "No recipient."
 msgstr ""
 
 #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
-#: ../../mod/message.php:242 ../../mod/message.php:250
-#: ../../include/conversation.php:902 ../../include/conversation.php:920
+#: ../../mod/message.php:249 ../../mod/message.php:257
+#: ../../mod/message.php:429 ../../mod/message.php:437
+#: ../../include/conversation.php:941 ../../include/conversation.php:959
 msgid "Please enter a link URL:"
 msgstr "请输入环节URL："
 
-#: ../../mod/wallmessage.php:138 ../../mod/message.php:278
+#: ../../mod/wallmessage.php:138 ../../mod/message.php:285
 msgid "Send Private Message"
 msgstr "发私人的通信"
 
@@ -2834,18 +2888,18 @@ msgid ""
 "your site allow private mail from unknown senders."
 msgstr ""
 
-#: ../../mod/wallmessage.php:140 ../../mod/message.php:279
-#: ../../mod/message.php:469
+#: ../../mod/wallmessage.php:140 ../../mod/message.php:286
+#: ../../mod/message.php:516
 msgid "To:"
 msgstr "到："
 
-#: ../../mod/wallmessage.php:141 ../../mod/message.php:284
-#: ../../mod/message.php:471
+#: ../../mod/wallmessage.php:141 ../../mod/message.php:291
+#: ../../mod/message.php:518
 msgid "Subject:"
 msgstr "题目："
 
-#: ../../mod/wallmessage.php:147 ../../mod/message.php:288
-#: ../../mod/message.php:474 ../../mod/invite.php:113
+#: ../../mod/wallmessage.php:147 ../../mod/message.php:295
+#: ../../mod/message.php:521 ../../mod/invite.php:115
 msgid "Your message:"
 msgstr "你的消息："
 
@@ -2902,7 +2956,7 @@ msgstr "校对别的设置，特别隐私设置。一个未出版的目录项目
 #: ../../mod/newmember.php:32 ../../mod/profperm.php:103
 #: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7
 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50
-#: ../../boot.php:1729
+#: ../../boot.php:1812
 msgid "Profile"
 msgstr "简介"
 
@@ -2944,7 +2998,7 @@ msgid "Connecting"
 msgstr ""
 
 #: ../../mod/newmember.php:49 ../../mod/newmember.php:51
-#: ../../addon/facebook/facebook.php:728 ../../addon/fbpost/fbpost.php:239
+#: ../../addon/facebook/facebook.php:730 ../../addon/fbpost/fbpost.php:294
 #: ../../include/contact_selectors.php:81
 #: ../../addon.old/facebook/facebook.php:728
 #: ../../addon.old/fbpost/fbpost.php:239
@@ -3007,7 +3061,7 @@ msgid ""
 "interest, and provide suggestions based on network relationships. On a brand"
 " new site, friend suggestions will usually begin to be populated within 24 "
 "hours."
-msgstr ""
+msgstr "在熟人页的工具栏有一些工具为找新朋友们。我们会使人们相配按名或兴趣，和以网络关系作为提醒建议的根据。在新网站，朋友建议平常开始24小时后。"
 
 #: ../../mod/newmember.php:66 ../../include/group.php:270
 msgid "Groups"
@@ -3065,7 +3119,7 @@ msgstr "组造成了。"
 msgid "Could not create group."
 msgstr "不能造成组。"
 
-#: ../../mod/group.php:47 ../../mod/group.php:137
+#: ../../mod/group.php:47 ../../mod/group.php:140
 msgid "Group not found."
 msgstr "组找不到。"
 
@@ -3077,31 +3131,31 @@ msgstr "组名变化了。"
 msgid "Permission denied"
 msgstr "权限不够"
 
-#: ../../mod/group.php:90
+#: ../../mod/group.php:93
 msgid "Create a group of contacts/friends."
 msgstr "造成组熟人／朋友们。"
 
-#: ../../mod/group.php:91 ../../mod/group.php:177
+#: ../../mod/group.php:94 ../../mod/group.php:180
 msgid "Group Name: "
 msgstr "组名："
 
-#: ../../mod/group.php:110
+#: ../../mod/group.php:113
 msgid "Group removed."
 msgstr "组删除了。"
 
-#: ../../mod/group.php:112
+#: ../../mod/group.php:115
 msgid "Unable to remove group."
 msgstr "不能删除组。"
 
-#: ../../mod/group.php:176
+#: ../../mod/group.php:179
 msgid "Group Editor"
 msgstr "组编辑器"
 
-#: ../../mod/group.php:189
+#: ../../mod/group.php:192
 msgid "Members"
 msgstr "成员"
 
-#: ../../mod/group.php:221 ../../mod/profperm.php:105
+#: ../../mod/group.php:223 ../../mod/profperm.php:105
 msgid "Click on a contact to add or remove."
 msgstr "点击熟人为添加或删除。"
 
@@ -3125,89 +3179,89 @@ msgstr "所有熟人(跟安全地简介使用权)"
 msgid "No contacts."
 msgstr "没有熟人。"
 
-#: ../../mod/viewcontacts.php:76 ../../include/text.php:625
+#: ../../mod/viewcontacts.php:76 ../../include/text.php:678
 msgid "View Contacts"
 msgstr "看熟人"
 
-#: ../../mod/register.php:89 ../../mod/regmod.php:52
+#: ../../mod/register.php:91 ../../mod/regmod.php:54
 #, php-format
 msgid "Registration details for %s"
 msgstr "注册信息为%s"
 
-#: ../../mod/register.php:97
+#: ../../mod/register.php:99
 msgid ""
 "Registration successful. Please check your email for further instructions."
 msgstr "注册成功了。请咨询说明再您的收件箱。"
 
-#: ../../mod/register.php:101
+#: ../../mod/register.php:103
 msgid "Failed to send email message. Here is the message that failed."
 msgstr "发邮件失败了。这条试失败的消息。"
 
-#: ../../mod/register.php:106
+#: ../../mod/register.php:108
 msgid "Your registration can not be processed."
 msgstr "处理不了您的注册。"
 
-#: ../../mod/register.php:143
+#: ../../mod/register.php:145
 #, php-format
 msgid "Registration request at %s"
 msgstr "注册要求再%s"
 
-#: ../../mod/register.php:152
+#: ../../mod/register.php:154
 msgid "Your registration is pending approval by the site owner."
 msgstr "您的注册等网页主的批准。"
 
-#: ../../mod/register.php:218
+#: ../../mod/register.php:220
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr "您会(可选的)用OpenID填这个表格通过提供您的OpenID和点击「注册」。"
 
-#: ../../mod/register.php:219
+#: ../../mod/register.php:221
 msgid ""
 "If you are not familiar with OpenID, please leave that field blank and fill "
 "in the rest of the items."
 msgstr "如果您没熟悉OpenID,请留空这个栏和填另些栏。"
 
-#: ../../mod/register.php:220
+#: ../../mod/register.php:222
 msgid "Your OpenID (optional): "
 msgstr "您的OpenID(可选的):"
 
-#: ../../mod/register.php:234
+#: ../../mod/register.php:236
 msgid "Include your profile in member directory?"
 msgstr "放您的简介再员目录？"
 
-#: ../../mod/register.php:256
+#: ../../mod/register.php:257
 msgid "Membership on this site is by invitation only."
 msgstr "会员身份在这个网站是光通过邀请。"
 
-#: ../../mod/register.php:257
+#: ../../mod/register.php:258
 msgid "Your invitation ID: "
 msgstr "您邀请ID："
 
-#: ../../mod/register.php:260 ../../mod/admin.php:444
+#: ../../mod/register.php:261 ../../mod/admin.php:462
 msgid "Registration"
 msgstr "注册"
 
-#: ../../mod/register.php:268
+#: ../../mod/register.php:269
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr "您姓名(例如「张三」):"
 
-#: ../../mod/register.php:269
+#: ../../mod/register.php:270
 msgid "Your Email Address: "
 msgstr "你的电子邮件地址："
 
-#: ../../mod/register.php:270
+#: ../../mod/register.php:271
 msgid ""
 "Choose a profile nickname. This must begin with a text character. Your "
 "profile address on this site will then be "
 "'<strong>nickname@$sitename</strong>'."
 msgstr "选择简介昵称。昵称头一字必须拉丁字。您再这个网站的简介地址将「<strong>example@$sitename</strong>」."
 
-#: ../../mod/register.php:271
+#: ../../mod/register.php:272
 msgid "Choose a nickname: "
 msgstr "选择昵称："
 
-#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:921
+#: ../../mod/register.php:275 ../../include/nav.php:81 ../../boot.php:983
 msgid "Register"
 msgstr "注册"
 
@@ -3216,20 +3270,20 @@ msgid "People Search"
 msgstr "搜索人物"
 
 #: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62
-#: ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook/theme.php:501 ../../include/text.php:1442
-#: ../../include/diaspora.php:1848 ../../include/conversation.php:125
+#: ../../addon/communityhome/communityhome.php:171
+#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1498
+#: ../../include/diaspora.php:1851 ../../include/conversation.php:125
 #: ../../include/conversation.php:253
 #: ../../addon.old/communityhome/communityhome.php:163
 msgid "photo"
 msgstr "照片"
 
 #: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/subthread.php:87
-#: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598
-#: ../../addon/communityhome/communityhome.php:158
-#: ../../addon/communityhome/communityhome.php:167
-#: ../../view/theme/diabook/theme.php:496
-#: ../../view/theme/diabook/theme.php:505 ../../include/diaspora.php:1848
+#: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1600
+#: ../../addon/communityhome/communityhome.php:166
+#: ../../addon/communityhome/communityhome.php:175
+#: ../../view/theme/diabook/theme.php:459
+#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1851
 #: ../../include/conversation.php:120 ../../include/conversation.php:129
 #: ../../include/conversation.php:248 ../../include/conversation.php:257
 #: ../../addon.old/facebook/facebook.php:1598
@@ -3238,9 +3292,9 @@ msgstr "照片"
 msgid "status"
 msgstr "现状"
 
-#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602
-#: ../../addon/communityhome/communityhome.php:172
-#: ../../view/theme/diabook/theme.php:510 ../../include/diaspora.php:1864
+#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1604
+#: ../../addon/communityhome/communityhome.php:180
+#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1867
 #: ../../include/conversation.php:136
 #: ../../addon.old/facebook/facebook.php:1602
 #: ../../addon.old/communityhome/communityhome.php:172
@@ -3254,8 +3308,8 @@ msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s不喜欢%2$s的%3$s"
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
-#: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:39
-#: ../../mod/display.php:169 ../../include/items.php:3843
+#: ../../mod/admin.php:773 ../../mod/admin.php:972 ../../mod/display.php:47
+#: ../../mod/display.php:177 ../../include/items.php:3853
 msgid "Item not found."
 msgstr "项目找不到。"
 
@@ -3264,24 +3318,24 @@ msgid "Access denied."
 msgstr "没有用权。"
 
 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90
-#: ../../include/nav.php:51 ../../boot.php:1736
+#: ../../include/nav.php:51 ../../boot.php:1819
 msgid "Photos"
 msgstr "照片"
 
-#: ../../mod/fbrowser.php:96
+#: ../../mod/fbrowser.php:113
 msgid "Files"
 msgstr ""
 
-#: ../../mod/regmod.php:61
+#: ../../mod/regmod.php:63
 msgid "Account approved."
 msgstr "账户批准了"
 
-#: ../../mod/regmod.php:98
+#: ../../mod/regmod.php:100
 #, php-format
 msgid "Registration revoked for %s"
 msgstr "%s的登记撤销了"
 
-#: ../../mod/regmod.php:110
+#: ../../mod/regmod.php:112
 msgid "Please login."
 msgstr "清登录。"
 
@@ -3293,35 +3347,35 @@ msgstr "找不到当初的新闻"
 msgid "Empty post discarded."
 msgstr "空心的新闻丢弃了"
 
-#: ../../mod/item.php:420 ../../mod/wall_upload.php:135
+#: ../../mod/item.php:424 ../../mod/wall_upload.php:135
 #: ../../mod/wall_upload.php:144 ../../mod/wall_upload.php:151
 #: ../../include/message.php:144
 msgid "Wall Photos"
 msgstr "墙照片"
 
-#: ../../mod/item.php:833
+#: ../../mod/item.php:837
 msgid "System error. Post not saved."
 msgstr "系统错误。x"
 
-#: ../../mod/item.php:858
+#: ../../mod/item.php:862
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social "
 "network."
 msgstr "这个新闻是由%s，Friendica社会化网络成员之一，发给你。"
 
-#: ../../mod/item.php:860
+#: ../../mod/item.php:864
 #, php-format
 msgid "You may visit them online at %s"
 msgstr "你可以网上拜访他在%s"
 
-#: ../../mod/item.php:861
+#: ../../mod/item.php:865
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr "你不想受到这些新闻的话，请回答这个新闻给发者联系。"
 
-#: ../../mod/item.php:863
+#: ../../mod/item.php:867
 #, php-format
 msgid "%s posted an update."
 msgstr "%s贴上一个新闻。"
@@ -3420,70 +3474,70 @@ msgstr "这要完全删除您的账户。这一做过，就不能恢复。"
 msgid "Please enter your password for verification:"
 msgstr "请输入密码为确认："
 
-#: ../../mod/message.php:9 ../../include/nav.php:131
+#: ../../mod/message.php:9 ../../include/nav.php:132
 msgid "New Message"
 msgstr "新的消息"
 
-#: ../../mod/message.php:63
+#: ../../mod/message.php:67
 msgid "Unable to locate contact information."
 msgstr "找不到熟人信息。"
 
-#: ../../mod/message.php:191
+#: ../../mod/message.php:195
 msgid "Message deleted."
 msgstr "消息删除了。"
 
-#: ../../mod/message.php:221
+#: ../../mod/message.php:225
 msgid "Conversation removed."
 msgstr "交流删除了。"
 
-#: ../../mod/message.php:327
+#: ../../mod/message.php:334
 msgid "No messages."
 msgstr "没有消息"
 
-#: ../../mod/message.php:334
+#: ../../mod/message.php:341
 #, php-format
 msgid "Unknown sender - %s"
 msgstr ""
 
-#: ../../mod/message.php:337
+#: ../../mod/message.php:344
 #, php-format
 msgid "You and %s"
 msgstr ""
 
-#: ../../mod/message.php:340
+#: ../../mod/message.php:347
 #, php-format
 msgid "%s and You"
 msgstr ""
 
-#: ../../mod/message.php:350 ../../mod/message.php:462
+#: ../../mod/message.php:368 ../../mod/message.php:509
 msgid "Delete conversation"
 msgstr "删除交谈"
 
-#: ../../mod/message.php:353
+#: ../../mod/message.php:371
 msgid "D, d M Y - g:i A"
 msgstr "D, d M Y - g:i A"
 
-#: ../../mod/message.php:356
+#: ../../mod/message.php:374
 #, php-format
 msgid "%d message"
 msgid_plural "%d messages"
 msgstr[0] ""
 
-#: ../../mod/message.php:391
+#: ../../mod/message.php:413
 msgid "Message not available."
 msgstr "通信不可用的"
 
-#: ../../mod/message.php:444
+#: ../../mod/message.php:483
 msgid "Delete message"
 msgstr "删除消息"
 
-#: ../../mod/message.php:464
+#: ../../mod/message.php:511
 msgid ""
 "No secure communications available. You <strong>may</strong> be able to "
 "respond from the sender's profile page."
 msgstr ""
 
-#: ../../mod/message.php:468
+#: ../../mod/message.php:515
 msgid "Send Reply"
 msgstr "发回答"
 
@@ -3500,31 +3554,31 @@ msgstr "没有朋友展示。"
 msgid "Theme settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:96 ../../mod/admin.php:442
+#: ../../mod/admin.php:96 ../../mod/admin.php:460
 msgid "Site"
 msgstr "网站"
 
-#: ../../mod/admin.php:97 ../../mod/admin.php:688 ../../mod/admin.php:701
+#: ../../mod/admin.php:97 ../../mod/admin.php:727 ../../mod/admin.php:740
 msgid "Users"
 msgstr "用户"
 
-#: ../../mod/admin.php:98 ../../mod/admin.php:783 ../../mod/admin.php:825
+#: ../../mod/admin.php:98 ../../mod/admin.php:822 ../../mod/admin.php:864
 msgid "Plugins"
 msgstr "插件"
 
-#: ../../mod/admin.php:99 ../../mod/admin.php:988 ../../mod/admin.php:1024
+#: ../../mod/admin.php:99 ../../mod/admin.php:1027 ../../mod/admin.php:1063
 msgid "Themes"
-msgstr ""
+msgstr "主题"
 
 #: ../../mod/admin.php:100
 msgid "DB updates"
 msgstr ""
 
-#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1111
+#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1150
 msgid "Logs"
 msgstr "记录"
 
-#: ../../mod/admin.php:120 ../../include/nav.php:146
+#: ../../mod/admin.php:120 ../../include/nav.php:151
 msgid "Admin"
 msgstr "管理"
 
@@ -3536,19 +3590,19 @@ msgstr ""
 msgid "User registrations waiting for confirmation"
 msgstr "用户注册等确认"
 
-#: ../../mod/admin.php:183 ../../mod/admin.php:669
+#: ../../mod/admin.php:183 ../../mod/admin.php:698
 msgid "Normal Account"
 msgstr "正常帐户"
 
-#: ../../mod/admin.php:184 ../../mod/admin.php:670
+#: ../../mod/admin.php:184 ../../mod/admin.php:699
 msgid "Soapbox Account"
 msgstr "演讲台帐户"
 
-#: ../../mod/admin.php:185 ../../mod/admin.php:671
+#: ../../mod/admin.php:185 ../../mod/admin.php:700
 msgid "Community/Celebrity Account"
 msgstr "社会／名人帐户"
 
-#: ../../mod/admin.php:186 ../../mod/admin.php:672
+#: ../../mod/admin.php:186 ../../mod/admin.php:701
 msgid "Automatic Friend Account"
 msgstr "自动朋友帐户"
 
@@ -3564,9 +3618,9 @@ msgstr ""
 msgid "Message queues"
 msgstr ""
 
-#: ../../mod/admin.php:212 ../../mod/admin.php:441 ../../mod/admin.php:687
-#: ../../mod/admin.php:782 ../../mod/admin.php:824 ../../mod/admin.php:987
-#: ../../mod/admin.php:1023 ../../mod/admin.php:1110
+#: ../../mod/admin.php:212 ../../mod/admin.php:459 ../../mod/admin.php:726
+#: ../../mod/admin.php:821 ../../mod/admin.php:863 ../../mod/admin.php:1026
+#: ../../mod/admin.php:1062 ../../mod/admin.php:1149
 msgid "Administration"
 msgstr "管理"
 
@@ -3590,560 +3644,620 @@ msgstr "版本"
 msgid "Active plugins"
 msgstr "活跃的插件"
 
-#: ../../mod/admin.php:373
+#: ../../mod/admin.php:391
 msgid "Site settings updated."
 msgstr "网站设置更新了。"
 
-#: ../../mod/admin.php:428
+#: ../../mod/admin.php:446
 msgid "Closed"
 msgstr "关闭"
 
-#: ../../mod/admin.php:429
+#: ../../mod/admin.php:447
 msgid "Requires approval"
 msgstr "要批准"
 
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:448
 msgid "Open"
 msgstr "打开"
 
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:452
 msgid "No SSL policy, links will track page SSL state"
 msgstr ""
 
-#: ../../mod/admin.php:435
+#: ../../mod/admin.php:453
 msgid "Force all links to use SSL"
 msgstr ""
 
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:454
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr ""
 
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:463
 msgid "File upload"
 msgstr "文件上传"
 
-#: ../../mod/admin.php:446
+#: ../../mod/admin.php:464
 msgid "Policies"
 msgstr "政策"
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:465
 msgid "Advanced"
 msgstr "高等"
 
-#: ../../mod/admin.php:451 ../../addon/statusnet/statusnet.php:567
+#: ../../mod/admin.php:466
+msgid "Performance"
+msgstr ""
+
+#: ../../mod/admin.php:470 ../../addon/statusnet/statusnet.php:744
 #: ../../addon.old/statusnet/statusnet.php:567
 msgid "Site name"
 msgstr "网页名字"
 
-#: ../../mod/admin.php:452
+#: ../../mod/admin.php:471
 msgid "Banner/Logo"
 msgstr "标题/标志"
 
-#: ../../mod/admin.php:453
+#: ../../mod/admin.php:472
 msgid "System language"
 msgstr "系统语言"
 
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:473
 msgid "System theme"
 msgstr "系统主题"
 
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:473
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr ""
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:474
 msgid "Mobile system theme"
 msgstr ""
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:474
 msgid "Theme for mobile devices"
 msgstr ""
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:475
 msgid "SSL link policy"
 msgstr ""
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:475
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr ""
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:476
+msgid "'Share' element"
+msgstr ""
+
+#: ../../mod/admin.php:476
+msgid "Activates the bbcode element 'share' for repeating items."
+msgstr ""
+
+#: ../../mod/admin.php:477
 msgid "Maximum image size"
 msgstr "图片最大尺寸"
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:477
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:478
 msgid "Maximum image length"
 msgstr ""
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:478
 msgid ""
 "Maximum length in pixels of the longest side of uploaded images. Default is "
 "-1, which means no limits."
 msgstr ""
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:479
 msgid "JPEG image quality"
 msgstr ""
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:479
 msgid ""
 "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
 "100, which is full quality."
 msgstr ""
 
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:481
 msgid "Register policy"
 msgstr "注册政策"
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:482
+msgid "Maximum Daily Registrations"
+msgstr ""
+
+#: ../../mod/admin.php:482
+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 ""
+
+#: ../../mod/admin.php:483
 msgid "Register text"
 msgstr "注册正文"
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:483
 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:484
 msgid "Accounts abandoned after x days"
 msgstr "账户丢弃X天后"
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:484
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "拒绝浪费系统资源看外网站找丢弃的账户。输入0为无时限。"
 
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:485
 msgid "Allowed friend domains"
 msgstr "允许的朋友域"
 
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:485
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr ""
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:486
 msgid "Allowed email domains"
 msgstr "允许的电子邮件域"
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:486
 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 ""
 
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:487
 msgid "Block public"
 msgstr "拦公开"
 
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:487
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr ""
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:488
 msgid "Force publish"
 msgstr "需要出版"
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:488
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: ../../mod/admin.php:468
+#: ../../mod/admin.php:489
 msgid "Global directory update URL"
 msgstr "综合目录更新URL"
 
-#: ../../mod/admin.php:468
+#: ../../mod/admin.php:489
 msgid ""
 "URL to update the global directory. If this is not set, the global directory"
 " is completely unavailable to the application."
 msgstr ""
 
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:490
 msgid "Allow threaded items"
 msgstr ""
 
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:490
 msgid "Allow infinite level threading for items on this site."
 msgstr ""
 
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:491
 msgid "Private posts by default for new users"
 msgstr ""
 
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:491
 msgid ""
 "Set default post permissions for all new members to the default privacy "
 "group rather than public."
 msgstr ""
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:493
 msgid "Block multiple registrations"
 msgstr "拦一人多注册"
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:493
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr ""
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:494
 msgid "OpenID support"
 msgstr "OpenID支持"
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:494
 msgid "OpenID support for registration and logins."
 msgstr ""
 
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:495
 msgid "Fullname check"
 msgstr "全名核实"
 
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:495
 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr ""
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:496
 msgid "UTF-8 Regular expressions"
 msgstr "UTF-8正则表达式"
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:496
 msgid "Use PHP UTF8 regular expressions"
 msgstr ""
 
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:497
 msgid "Show Community Page"
 msgstr "表示社会页"
 
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:497
 msgid ""
 "Display a Community page showing all recent public postings on this site."
 msgstr ""
 
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:498
 msgid "Enable OStatus support"
 msgstr "使OStatus支持可用"
 
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:498
 msgid ""
 "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All "
 "communications in OStatus are public, so privacy warnings will be "
 "occasionally displayed."
 msgstr ""
 
-#: ../../mod/admin.php:478
+#: ../../mod/admin.php:499
 msgid "Enable Diaspora support"
 msgstr "使Diaspora支持能够"
 
-#: ../../mod/admin.php:478
+#: ../../mod/admin.php:499
 msgid "Provide built-in Diaspora network compatibility."
 msgstr ""
 
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:500
 msgid "Only allow Friendica contacts"
 msgstr "只许Friendica熟人"
 
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:500
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr ""
 
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:501
 msgid "Verify SSL"
 msgstr "证实"
 
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:501
 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 ""
 
-#: ../../mod/admin.php:481
+#: ../../mod/admin.php:502
 msgid "Proxy user"
 msgstr "代理用户"
 
-#: ../../mod/admin.php:482
+#: ../../mod/admin.php:503
 msgid "Proxy URL"
 msgstr "代理URL"
 
-#: ../../mod/admin.php:483
+#: ../../mod/admin.php:504
 msgid "Network timeout"
 msgstr "网络超时"
 
-#: ../../mod/admin.php:483
+#: ../../mod/admin.php:504
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../mod/admin.php:484
+#: ../../mod/admin.php:505
 msgid "Delivery interval"
 msgstr ""
 
-#: ../../mod/admin.php:484
+#: ../../mod/admin.php:505
 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 ""
 
-#: ../../mod/admin.php:485
+#: ../../mod/admin.php:506
 msgid "Poll interval"
 msgstr ""
 
-#: ../../mod/admin.php:485
+#: ../../mod/admin.php:506
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr ""
 
-#: ../../mod/admin.php:486
+#: ../../mod/admin.php:507
 msgid "Maximum Load Average"
 msgstr ""
 
-#: ../../mod/admin.php:486
+#: ../../mod/admin.php:507
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr ""
 
-#: ../../mod/admin.php:503
-msgid "Update has been marked successful"
+#: ../../mod/admin.php:509
+msgid "Use MySQL full text engine"
+msgstr ""
+
+#: ../../mod/admin.php:509
+msgid ""
+"Activates the full text engine. Speeds up search - but can only search for "
+"four and more characters."
+msgstr ""
+
+#: ../../mod/admin.php:510
+msgid "Path to item cache"
+msgstr ""
+
+#: ../../mod/admin.php:511
+msgid "Cache duration in seconds"
+msgstr ""
+
+#: ../../mod/admin.php:511
+msgid ""
+"How long should the cache files be hold? Default value is 86400 seconds (One"
+" day)."
+msgstr ""
+
+#: ../../mod/admin.php:512
+msgid "Path for lock file"
 msgstr ""
 
 #: ../../mod/admin.php:513
+msgid "Temp path"
+msgstr ""
+
+#: ../../mod/admin.php:514
+msgid "Base path to installation"
+msgstr ""
+
+#: ../../mod/admin.php:532
+msgid "Update has been marked successful"
+msgstr ""
+
+#: ../../mod/admin.php:542
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr ""
 
-#: ../../mod/admin.php:516
+#: ../../mod/admin.php:545
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr ""
 
-#: ../../mod/admin.php:520
+#: ../../mod/admin.php:549
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: ../../mod/admin.php:523
+#: ../../mod/admin.php:552
 #, php-format
 msgid "Update function %s could not be found."
 msgstr ""
 
-#: ../../mod/admin.php:538
+#: ../../mod/admin.php:567
 msgid "No failed updates."
 msgstr ""
 
-#: ../../mod/admin.php:542
+#: ../../mod/admin.php:571
 msgid "Failed Updates"
 msgstr ""
 
-#: ../../mod/admin.php:543
+#: ../../mod/admin.php:572
 msgid ""
 "This does not include updates prior to 1139, which did not return a status."
 msgstr ""
 
-#: ../../mod/admin.php:544
+#: ../../mod/admin.php:573
 msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: ../../mod/admin.php:545
+#: ../../mod/admin.php:574
 msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: ../../mod/admin.php:570
+#: ../../mod/admin.php:599
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 
-#: ../../mod/admin.php:577
+#: ../../mod/admin.php:606
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] "%s用户删除了"
 
-#: ../../mod/admin.php:616
+#: ../../mod/admin.php:645
 #, php-format
 msgid "User '%s' deleted"
 msgstr "用户「%s」删除了"
 
-#: ../../mod/admin.php:624
+#: ../../mod/admin.php:653
 #, php-format
 msgid "User '%s' unblocked"
 msgstr "用户「%s」无拦了"
 
-#: ../../mod/admin.php:624
+#: ../../mod/admin.php:653
 #, php-format
 msgid "User '%s' blocked"
 msgstr "用户「%s」拦了"
 
-#: ../../mod/admin.php:690
+#: ../../mod/admin.php:729
 msgid "select all"
 msgstr "都选"
 
-#: ../../mod/admin.php:691
+#: ../../mod/admin.php:730
 msgid "User registrations waiting for confirm"
 msgstr "用户注册等待确认"
 
-#: ../../mod/admin.php:692
+#: ../../mod/admin.php:731
 msgid "Request date"
 msgstr "要求日期"
 
-#: ../../mod/admin.php:692 ../../mod/admin.php:702
+#: ../../mod/admin.php:731 ../../mod/admin.php:741
 #: ../../include/contact_selectors.php:79
+#: ../../include/contact_selectors.php:86
 msgid "Email"
 msgstr "电子邮件"
 
-#: ../../mod/admin.php:693
+#: ../../mod/admin.php:732
 msgid "No registrations."
 msgstr "没有注册。"
 
-#: ../../mod/admin.php:695
+#: ../../mod/admin.php:734
 msgid "Deny"
 msgstr "否定"
 
-#: ../../mod/admin.php:699
+#: ../../mod/admin.php:738
 msgid "Site admin"
 msgstr ""
 
-#: ../../mod/admin.php:702
+#: ../../mod/admin.php:741
 msgid "Register date"
 msgstr "注册日期"
 
-#: ../../mod/admin.php:702
+#: ../../mod/admin.php:741
 msgid "Last login"
 msgstr "上次登录"
 
-#: ../../mod/admin.php:702
+#: ../../mod/admin.php:741
 msgid "Last item"
 msgstr "上项目"
 
-#: ../../mod/admin.php:702
+#: ../../mod/admin.php:741
 msgid "Account"
 msgstr "帐户"
 
-#: ../../mod/admin.php:704
+#: ../../mod/admin.php:743
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "特定的用户被删除！\\n\\n什么这些用户放在这个网站被永远删除！\\n\\n您肯定吗？"
 
-#: ../../mod/admin.php:705
+#: ../../mod/admin.php:744
 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 "用户{0}将被删除！\\n\\n什么这个用户放在这个网站被永远删除！\\n\\n您肯定吗？"
 
-#: ../../mod/admin.php:746
+#: ../../mod/admin.php:785
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "使插件%s不能用。"
 
-#: ../../mod/admin.php:750
+#: ../../mod/admin.php:789
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "使插件%s能用。"
 
-#: ../../mod/admin.php:760 ../../mod/admin.php:958
+#: ../../mod/admin.php:799 ../../mod/admin.php:997
 msgid "Disable"
 msgstr "使不能用"
 
-#: ../../mod/admin.php:762 ../../mod/admin.php:960
+#: ../../mod/admin.php:801 ../../mod/admin.php:999
 msgid "Enable"
 msgstr "使能用"
 
-#: ../../mod/admin.php:784 ../../mod/admin.php:989
+#: ../../mod/admin.php:823 ../../mod/admin.php:1028
 msgid "Toggle"
 msgstr "肘节"
 
-#: ../../mod/admin.php:792 ../../mod/admin.php:999
+#: ../../mod/admin.php:831 ../../mod/admin.php:1038
 msgid "Author: "
 msgstr ""
 
-#: ../../mod/admin.php:793 ../../mod/admin.php:1000
+#: ../../mod/admin.php:832 ../../mod/admin.php:1039
 msgid "Maintainer: "
 msgstr ""
 
-#: ../../mod/admin.php:922
+#: ../../mod/admin.php:961
 msgid "No themes found."
-msgstr ""
+msgstr "找不到主题。"
 
-#: ../../mod/admin.php:981
+#: ../../mod/admin.php:1020
 msgid "Screenshot"
 msgstr ""
 
-#: ../../mod/admin.php:1029
+#: ../../mod/admin.php:1068
 msgid "[Experimental]"
 msgstr ""
 
-#: ../../mod/admin.php:1030
+#: ../../mod/admin.php:1069
 msgid "[Unsupported]"
 msgstr ""
 
-#: ../../mod/admin.php:1057
+#: ../../mod/admin.php:1096
 msgid "Log settings updated."
 msgstr "日志设置更新了。"
 
-#: ../../mod/admin.php:1113
+#: ../../mod/admin.php:1152
 msgid "Clear"
 msgstr "清理出"
 
-#: ../../mod/admin.php:1119
+#: ../../mod/admin.php:1158
 msgid "Debugging"
 msgstr "调试"
 
-#: ../../mod/admin.php:1120
+#: ../../mod/admin.php:1159
 msgid "Log file"
 msgstr "记录文件"
 
-#: ../../mod/admin.php:1120
+#: ../../mod/admin.php:1159
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr "必要被网页服务器可写的。相对Friendica主文件夹。"
 
-#: ../../mod/admin.php:1121
+#: ../../mod/admin.php:1160
 msgid "Log level"
 msgstr "记录水平"
 
-#: ../../mod/admin.php:1171
+#: ../../mod/admin.php:1210
 msgid "Close"
 msgstr "关闭"
 
-#: ../../mod/admin.php:1177
+#: ../../mod/admin.php:1216
 msgid "FTP Host"
 msgstr "FTP主机"
 
-#: ../../mod/admin.php:1178
+#: ../../mod/admin.php:1217
 msgid "FTP Path"
 msgstr "FTP目录"
 
-#: ../../mod/admin.php:1179
+#: ../../mod/admin.php:1218
 msgid "FTP User"
 msgstr "FTP用户"
 
-#: ../../mod/admin.php:1180
+#: ../../mod/admin.php:1219
 msgid "FTP Password"
 msgstr "FTP密码"
 
-#: ../../mod/profile.php:21 ../../boot.php:1124
+#: ../../mod/profile.php:21 ../../boot.php:1196
 msgid "Requested profile is not available."
 msgstr "要求的简介联系不上的。"
 
-#: ../../mod/profile.php:155 ../../mod/display.php:87
+#: ../../mod/profile.php:155 ../../mod/display.php:95
 msgid "Access to this profile has been restricted."
 msgstr "使用权这个简介被限制了."
 
@@ -4196,7 +4310,7 @@ msgstr "{0}用#%s标签%s的文章"
 msgid "{0} mentioned you in a post"
 msgstr "{0}提到您在文章"
 
-#: ../../mod/nogroup.php:58
+#: ../../mod/nogroup.php:59
 msgid "Contacts who are not members of a group"
 msgstr ""
 
@@ -4209,8 +4323,8 @@ msgid ""
 "Account not found and OpenID registration is not permitted on this site."
 msgstr ""
 
-#: ../../mod/openid.php:93 ../../include/auth.php:110
-#: ../../include/auth.php:173
+#: ../../mod/openid.php:93 ../../include/auth.php:112
+#: ../../include/auth.php:175
 msgid "Login failed."
 msgstr "登记失败了。"
 
@@ -4231,11 +4345,11 @@ msgstr ""
 msgid "%1$s is following %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/share.php:28
+#: ../../mod/share.php:43
 msgid "link"
 msgstr ""
 
-#: ../../mod/display.php:162
+#: ../../mod/display.php:170
 msgid "Item has been removed."
 msgstr "项目被删除了。"
 
@@ -4247,325 +4361,331 @@ msgstr "应用"
 msgid "No installed applications."
 msgstr "没有安装的应用"
 
-#: ../../mod/search.php:96 ../../include/text.php:685
-#: ../../include/text.php:686 ../../include/nav.php:91
+#: ../../mod/search.php:99 ../../include/text.php:738
+#: ../../include/text.php:739 ../../include/nav.php:91
 msgid "Search"
 msgstr "搜索"
 
-#: ../../mod/profiles.php:21 ../../mod/profiles.php:434
-#: ../../mod/profiles.php:548 ../../mod/dfrn_confirm.php:62
+#: ../../mod/profiles.php:20 ../../mod/profiles.php:135
+#: ../../mod/profiles.php:162 ../../mod/profiles.php:576
+#: ../../mod/dfrn_confirm.php:62
 msgid "Profile not found."
 msgstr "找不到简介。"
 
-#: ../../mod/profiles.php:31
+#: ../../mod/profiles.php:39
+msgid "Profile deleted."
+msgstr "简介删除了。"
+
+#: ../../mod/profiles.php:57 ../../mod/profiles.php:91
+msgid "Profile-"
+msgstr "简介-"
+
+#: ../../mod/profiles.php:76 ../../mod/profiles.php:119
+msgid "New profile created."
+msgstr "创造新的简介"
+
+#: ../../mod/profiles.php:97
+msgid "Profile unavailable to clone."
+msgstr "简介不可用为复制。"
+
+#: ../../mod/profiles.php:172
 msgid "Profile Name is required."
 msgstr "必要简介名"
 
-#: ../../mod/profiles.php:171
+#: ../../mod/profiles.php:319
 msgid "Marital Status"
 msgstr ""
 
-#: ../../mod/profiles.php:175
+#: ../../mod/profiles.php:323
 msgid "Romantic Partner"
 msgstr ""
 
-#: ../../mod/profiles.php:179
+#: ../../mod/profiles.php:327
 msgid "Likes"
 msgstr ""
 
-#: ../../mod/profiles.php:183
+#: ../../mod/profiles.php:331
 msgid "Dislikes"
 msgstr ""
 
-#: ../../mod/profiles.php:187
+#: ../../mod/profiles.php:335
 msgid "Work/Employment"
 msgstr ""
 
-#: ../../mod/profiles.php:190
+#: ../../mod/profiles.php:338
 msgid "Religion"
 msgstr ""
 
-#: ../../mod/profiles.php:194
+#: ../../mod/profiles.php:342
 msgid "Political Views"
 msgstr ""
 
-#: ../../mod/profiles.php:198
+#: ../../mod/profiles.php:346
 msgid "Gender"
 msgstr ""
 
-#: ../../mod/profiles.php:202
+#: ../../mod/profiles.php:350
 msgid "Sexual Preference"
 msgstr ""
 
-#: ../../mod/profiles.php:206
+#: ../../mod/profiles.php:354
 msgid "Homepage"
 msgstr ""
 
-#: ../../mod/profiles.php:210
+#: ../../mod/profiles.php:358
 msgid "Interests"
 msgstr ""
 
-#: ../../mod/profiles.php:214
+#: ../../mod/profiles.php:362
 msgid "Address"
 msgstr ""
 
-#: ../../mod/profiles.php:221 ../../addon/dav/common/wdcal_edit.inc.php:183
+#: ../../mod/profiles.php:369 ../../addon/dav/common/wdcal_edit.inc.php:183
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:183
 msgid "Location"
 msgstr ""
 
-#: ../../mod/profiles.php:304
+#: ../../mod/profiles.php:452
 msgid "Profile updated."
 msgstr "简介更新了。"
 
-#: ../../mod/profiles.php:371
+#: ../../mod/profiles.php:519
 msgid " and "
 msgstr ""
 
-#: ../../mod/profiles.php:379
+#: ../../mod/profiles.php:527
 msgid "public profile"
 msgstr ""
 
-#: ../../mod/profiles.php:382
+#: ../../mod/profiles.php:530
 #, php-format
 msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
 msgstr ""
 
-#: ../../mod/profiles.php:383
+#: ../../mod/profiles.php:531
 #, php-format
 msgid " - Visit %1$s's %2$s"
 msgstr ""
 
-#: ../../mod/profiles.php:386
+#: ../../mod/profiles.php:534
 #, php-format
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: ../../mod/profiles.php:453
-msgid "Profile deleted."
-msgstr "简介删除了。"
-
-#: ../../mod/profiles.php:471 ../../mod/profiles.php:505
-msgid "Profile-"
-msgstr "简介-"
-
-#: ../../mod/profiles.php:490 ../../mod/profiles.php:532
-msgid "New profile created."
-msgstr "创造新的简介"
-
-#: ../../mod/profiles.php:511
-msgid "Profile unavailable to clone."
-msgstr "简介不可用为复制。"
-
-#: ../../mod/profiles.php:573
+#: ../../mod/profiles.php:602
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr "藏起来发现您的熟人／朋友单不让这个简介看着看？"
 
-#: ../../mod/profiles.php:593
+#: ../../mod/profiles.php:622
 msgid "Edit Profile Details"
 msgstr "剪辑简介消息"
 
-#: ../../mod/profiles.php:595
+#: ../../mod/profiles.php:624
+msgid "Change Profile Photo"
+msgstr ""
+
+#: ../../mod/profiles.php:625
 msgid "View this profile"
 msgstr "看这个简介"
 
-#: ../../mod/profiles.php:596
+#: ../../mod/profiles.php:626
 msgid "Create a new profile using these settings"
 msgstr "造成新的简介用这些设置"
 
-#: ../../mod/profiles.php:597
+#: ../../mod/profiles.php:627
 msgid "Clone this profile"
 msgstr "复制这个简介"
 
-#: ../../mod/profiles.php:598
+#: ../../mod/profiles.php:628
 msgid "Delete this profile"
 msgstr "删除这个简介"
 
-#: ../../mod/profiles.php:599
+#: ../../mod/profiles.php:629
 msgid "Profile Name:"
 msgstr "简介名："
 
-#: ../../mod/profiles.php:600
+#: ../../mod/profiles.php:630
 msgid "Your Full Name:"
 msgstr "你的全名："
 
-#: ../../mod/profiles.php:601
+#: ../../mod/profiles.php:631
 msgid "Title/Description:"
 msgstr "标题／描述："
 
-#: ../../mod/profiles.php:602
+#: ../../mod/profiles.php:632
 msgid "Your Gender:"
 msgstr "你的性："
 
-#: ../../mod/profiles.php:603
+#: ../../mod/profiles.php:633
 #, php-format
 msgid "Birthday (%s):"
 msgstr "生日(%s):"
 
-#: ../../mod/profiles.php:604
+#: ../../mod/profiles.php:634
 msgid "Street Address:"
 msgstr "地址："
 
-#: ../../mod/profiles.php:605
+#: ../../mod/profiles.php:635
 msgid "Locality/City:"
 msgstr "现场／城市："
 
-#: ../../mod/profiles.php:606
+#: ../../mod/profiles.php:636
 msgid "Postal/Zip Code:"
 msgstr "邮政编码："
 
-#: ../../mod/profiles.php:607
+#: ../../mod/profiles.php:637
 msgid "Country:"
 msgstr "国家："
 
-#: ../../mod/profiles.php:608
+#: ../../mod/profiles.php:638
 msgid "Region/State:"
 msgstr "区域／省"
 
-#: ../../mod/profiles.php:609
+#: ../../mod/profiles.php:639
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr "<span class=\"heart\">&hearts;</span>婚姻状况："
 
-#: ../../mod/profiles.php:610
+#: ../../mod/profiles.php:640
 msgid "Who: (if applicable)"
 msgstr "谁：（要是使用）"
 
-#: ../../mod/profiles.php:611
+#: ../../mod/profiles.php:641
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr "比如：limou，李某，limou＠example。com"
 
-#: ../../mod/profiles.php:612
+#: ../../mod/profiles.php:642
 msgid "Since [date]:"
 msgstr ""
 
-#: ../../mod/profiles.php:613 ../../include/profile_advanced.php:46
+#: ../../mod/profiles.php:643 ../../include/profile_advanced.php:46
 msgid "Sexual Preference:"
 msgstr "性取向"
 
-#: ../../mod/profiles.php:614
+#: ../../mod/profiles.php:644
 msgid "Homepage URL:"
 msgstr "主页URL："
 
-#: ../../mod/profiles.php:615 ../../include/profile_advanced.php:50
+#: ../../mod/profiles.php:645 ../../include/profile_advanced.php:50
 msgid "Hometown:"
 msgstr ""
 
-#: ../../mod/profiles.php:616 ../../include/profile_advanced.php:54
+#: ../../mod/profiles.php:646 ../../include/profile_advanced.php:54
 msgid "Political Views:"
 msgstr "政治观念："
 
-#: ../../mod/profiles.php:617
+#: ../../mod/profiles.php:647
 msgid "Religious Views:"
 msgstr " 宗教信仰 ："
 
-#: ../../mod/profiles.php:618
+#: ../../mod/profiles.php:648
 msgid "Public Keywords:"
 msgstr "公开关键字 ："
 
-#: ../../mod/profiles.php:619
+#: ../../mod/profiles.php:649
 msgid "Private Keywords:"
 msgstr "私人关键字"
 
-#: ../../mod/profiles.php:620 ../../include/profile_advanced.php:62
+#: ../../mod/profiles.php:650 ../../include/profile_advanced.php:62
 msgid "Likes:"
 msgstr ""
 
-#: ../../mod/profiles.php:621 ../../include/profile_advanced.php:64
+#: ../../mod/profiles.php:651 ../../include/profile_advanced.php:64
 msgid "Dislikes:"
 msgstr ""
 
-#: ../../mod/profiles.php:622
+#: ../../mod/profiles.php:652
 msgid "Example: fishing photography software"
 msgstr "例如：钓鱼 照片 软件"
 
-#: ../../mod/profiles.php:623
+#: ../../mod/profiles.php:653
 msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr "(用于建议可能的朋友们，会被别人看)"
 
-#: ../../mod/profiles.php:624
+#: ../../mod/profiles.php:654
 msgid "(Used for searching profiles, never shown to others)"
 msgstr "(用于搜索简介，没有给别人看)"
 
-#: ../../mod/profiles.php:625
+#: ../../mod/profiles.php:655
 msgid "Tell us about yourself..."
 msgstr "给我们自我介绍..."
 
-#: ../../mod/profiles.php:626
+#: ../../mod/profiles.php:656
 msgid "Hobbies/Interests"
 msgstr "爱好／兴趣"
 
-#: ../../mod/profiles.php:627
+#: ../../mod/profiles.php:657
 msgid "Contact information and Social Networks"
 msgstr "熟人信息和社会化网络"
 
-#: ../../mod/profiles.php:628
+#: ../../mod/profiles.php:658
 msgid "Musical interests"
 msgstr "音乐兴趣"
 
-#: ../../mod/profiles.php:629
+#: ../../mod/profiles.php:659
 msgid "Books, literature"
 msgstr "书，文学"
 
-#: ../../mod/profiles.php:630
+#: ../../mod/profiles.php:660
 msgid "Television"
 msgstr "电视"
 
-#: ../../mod/profiles.php:631
+#: ../../mod/profiles.php:661
 msgid "Film/dance/culture/entertainment"
 msgstr "电影／跳舞／文化／娱乐"
 
-#: ../../mod/profiles.php:632
+#: ../../mod/profiles.php:662
 msgid "Love/romance"
 msgstr "爱情／浪漫"
 
-#: ../../mod/profiles.php:633
+#: ../../mod/profiles.php:663
 msgid "Work/employment"
 msgstr "工作"
 
-#: ../../mod/profiles.php:634
+#: ../../mod/profiles.php:664
 msgid "School/education"
 msgstr "学院／教育"
 
-#: ../../mod/profiles.php:639
+#: ../../mod/profiles.php:669
 msgid ""
 "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
 "be visible to anybody using the internet."
 msgstr "这是你的<strong>公开的</strong>简介。<br />它<strong>可能</strong>被所有的因特网用的看到。"
 
-#: ../../mod/profiles.php:649 ../../mod/directory.php:111
+#: ../../mod/profiles.php:679 ../../mod/directory.php:111
+#: ../../addon/forumdirectory/forumdirectory.php:133
 msgid "Age: "
 msgstr "年纪："
 
-#: ../../mod/profiles.php:688
+#: ../../mod/profiles.php:718
 msgid "Edit/Manage Profiles"
 msgstr "编辑／管理简介"
 
-#: ../../mod/profiles.php:689 ../../boot.php:1242
+#: ../../mod/profiles.php:719 ../../boot.php:1316
 msgid "Change profile photo"
 msgstr "换简介照片"
 
-#: ../../mod/profiles.php:690 ../../boot.php:1243
+#: ../../mod/profiles.php:720 ../../boot.php:1317
 msgid "Create New Profile"
 msgstr "创造新的简介"
 
-#: ../../mod/profiles.php:701 ../../boot.php:1253
+#: ../../mod/profiles.php:731 ../../boot.php:1327
 msgid "Profile Image"
 msgstr "简介图像"
 
-#: ../../mod/profiles.php:703 ../../boot.php:1256
+#: ../../mod/profiles.php:733 ../../boot.php:1330
 msgid "visible to everybody"
 msgstr "给打假可见的"
 
-#: ../../mod/profiles.php:704 ../../boot.php:1257
+#: ../../mod/profiles.php:734 ../../boot.php:1331
 msgid "Edit visibility"
 msgstr "修改能见度"
 
-#: ../../mod/filer.php:29 ../../include/conversation.php:906
-#: ../../include/conversation.php:924
+#: ../../mod/filer.php:30 ../../include/conversation.php:945
+#: ../../include/conversation.php:963
 msgid "Save to Folder:"
 msgstr ""
 
-#: ../../mod/filer.php:29
+#: ../../mod/filer.php:30
 msgid "- select -"
 msgstr ""
 
@@ -4576,30 +4696,30 @@ msgstr "%1$s把%4$s标签%2$s的%3$s"
 
 #: ../../mod/delegate.php:95
 msgid "No potential page delegates located."
-msgstr ""
+msgstr "找不到可能代表页人。"
 
-#: ../../mod/delegate.php:121
+#: ../../mod/delegate.php:121 ../../include/nav.php:138
 msgid "Delegate Page Management"
-msgstr ""
+msgstr "页代表管理"
 
 #: ../../mod/delegate.php:123
 msgid ""
 "Delegates are able to manage all aspects of this account/page except for "
 "basic account settings. Please do not delegate your personal account to "
 "anybody that you do not trust completely."
-msgstr ""
+msgstr "代表会管理所有的方面这个账户／页除了基础账户配置以外。请别代表您私人账户给您没完全信的人。"
 
 #: ../../mod/delegate.php:124
 msgid "Existing Page Managers"
-msgstr ""
+msgstr "目前页管理员"
 
 #: ../../mod/delegate.php:126
 msgid "Existing Page Delegates"
-msgstr ""
+msgstr "目前页代表"
 
 #: ../../mod/delegate.php:128
 msgid "Potential Delegates"
-msgstr ""
+msgstr "潜力的代表"
 
 #: ../../mod/delegate.php:131
 msgid "Add"
@@ -4653,7 +4773,7 @@ msgstr ""
 msgid "diaspora2bb: "
 msgstr ""
 
-#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:557
+#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:520
 #: ../../include/contact_widgets.php:34
 msgid "Friend Suggestions"
 msgstr "友谊建议"
@@ -4668,70 +4788,78 @@ msgstr "没有建议。如果这是新网站，请24小时后再试。"
 msgid "Ignore/Hide"
 msgstr "不理／隐藏"
 
-#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:555
+#: ../../mod/directory.php:49 ../../addon/forumdirectory/forumdirectory.php:71
+#: ../../view/theme/diabook/theme.php:518
 msgid "Global Directory"
 msgstr "综合目录"
 
-#: ../../mod/directory.php:57
+#: ../../mod/directory.php:57 ../../addon/forumdirectory/forumdirectory.php:79
 msgid "Find on this site"
 msgstr "找在这网站"
 
-#: ../../mod/directory.php:60
+#: ../../mod/directory.php:60 ../../addon/forumdirectory/forumdirectory.php:82
 msgid "Site Directory"
 msgstr "网站目录"
 
 #: ../../mod/directory.php:114
+#: ../../addon/forumdirectory/forumdirectory.php:136
 msgid "Gender: "
 msgstr "性别："
 
-#: ../../mod/directory.php:136 ../../include/profile_advanced.php:17
-#: ../../boot.php:1278
+#: ../../mod/directory.php:136
+#: ../../addon/forumdirectory/forumdirectory.php:158
+#: ../../include/profile_advanced.php:17 ../../boot.php:1352
 msgid "Gender:"
 msgstr "性别:"
 
-#: ../../mod/directory.php:138 ../../include/profile_advanced.php:37
-#: ../../boot.php:1281
+#: ../../mod/directory.php:138
+#: ../../addon/forumdirectory/forumdirectory.php:160
+#: ../../include/profile_advanced.php:37 ../../boot.php:1355
 msgid "Status:"
 msgstr "现状:"
 
-#: ../../mod/directory.php:140 ../../include/profile_advanced.php:48
-#: ../../boot.php:1283
+#: ../../mod/directory.php:140
+#: ../../addon/forumdirectory/forumdirectory.php:162
+#: ../../include/profile_advanced.php:48 ../../boot.php:1357
 msgid "Homepage:"
 msgstr "主页:"
 
-#: ../../mod/directory.php:142 ../../include/profile_advanced.php:58
+#: ../../mod/directory.php:142
+#: ../../addon/forumdirectory/forumdirectory.php:164
+#: ../../include/profile_advanced.php:58
 msgid "About:"
 msgstr "关于："
 
-#: ../../mod/directory.php:180
+#: ../../mod/directory.php:187
+#: ../../addon/forumdirectory/forumdirectory.php:203
 msgid "No entries (some entries may be hidden)."
 msgstr "没有文章(有的文章会被隐藏)。"
 
-#: ../../mod/invite.php:35
+#: ../../mod/invite.php:37
 #, php-format
 msgid "%s : Not a valid email address."
 msgstr "%s : 不是效的电子邮件地址."
 
-#: ../../mod/invite.php:59
+#: ../../mod/invite.php:61
 msgid "Please join us on Friendica"
 msgstr ""
 
-#: ../../mod/invite.php:69
+#: ../../mod/invite.php:71
 #, php-format
 msgid "%s : Message delivery failed."
 msgstr "%s : 送消息失败了。"
 
-#: ../../mod/invite.php:73
+#: ../../mod/invite.php:75
 #, php-format
 msgid "%d message sent."
 msgid_plural "%d messages sent."
 msgstr[0] "%d消息传送了。"
 
-#: ../../mod/invite.php:92
+#: ../../mod/invite.php:94
 msgid "You have no more invitations available"
 msgstr "您没有别的邀请"
 
-#: ../../mod/invite.php:100
+#: ../../mod/invite.php:102
 #, php-format
 msgid ""
 "Visit %s for a list of public sites that you can join. Friendica members on "
@@ -4739,14 +4867,14 @@ msgid ""
 " other social networks."
 msgstr ""
 
-#: ../../mod/invite.php:102
+#: ../../mod/invite.php:104
 #, php-format
 msgid ""
 "To accept this invitation, please visit and register at %s or any other "
 "public Friendica website."
 msgstr ""
 
-#: ../../mod/invite.php:103
+#: ../../mod/invite.php:105
 #, php-format
 msgid ""
 "Friendica sites all inter-connect to create a huge privacy-enhanced social "
@@ -4755,36 +4883,36 @@ msgid ""
 "sites you can join."
 msgstr ""
 
-#: ../../mod/invite.php:106
+#: ../../mod/invite.php:108
 msgid ""
 "Our apologies. This system is not currently configured to connect with other"
 " public sites or invite members."
 msgstr ""
 
-#: ../../mod/invite.php:111
+#: ../../mod/invite.php:113
 msgid "Send invitations"
 msgstr "发请柬"
 
-#: ../../mod/invite.php:112
+#: ../../mod/invite.php:114
 msgid "Enter email addresses, one per line:"
 msgstr "输入电子邮件地址，一行一个："
 
-#: ../../mod/invite.php:114
+#: ../../mod/invite.php:116
 msgid ""
 "You are cordially invited to join me and other close friends on Friendica - "
 "and help us to create a better social web."
 msgstr ""
 
-#: ../../mod/invite.php:116
+#: ../../mod/invite.php:118
 msgid "You will need to supply this invitation code: $invite_code"
 msgstr "您要输入这个邀请密码：$invite_code"
 
-#: ../../mod/invite.php:116
+#: ../../mod/invite.php:118
 msgid ""
 "Once you have registered, please connect with me via my profile page at:"
 msgstr "您一注册，请页跟我连接，用我的简介在："
 
-#: ../../mod/invite.php:118
+#: ../../mod/invite.php:120
 msgid ""
 "For more information about the Friendica project and why we feel it is "
 "important, please visit http://friendica.com"
@@ -4867,68 +4995,68 @@ msgstr "不能创作您的熟人证件在我们的系统。"
 msgid "Unable to update your contact profile details on our system"
 msgstr "不能更新您的熟人简介消息在我们的系统"
 
-#: ../../mod/dfrn_confirm.php:750
+#: ../../mod/dfrn_confirm.php:751
 #, php-format
 msgid "Connection accepted at %s"
 msgstr "联络接受了在%s"
 
-#: ../../mod/dfrn_confirm.php:799
+#: ../../mod/dfrn_confirm.php:800
 #, php-format
 msgid "%1$s has joined %2$s"
 msgstr ""
 
-#: ../../addon/fromgplus/fromgplus.php:29
+#: ../../addon/fromgplus/fromgplus.php:33
 #: ../../addon.old/fromgplus/fromgplus.php:29
 msgid "Google+ Import Settings"
 msgstr ""
 
-#: ../../addon/fromgplus/fromgplus.php:32
+#: ../../addon/fromgplus/fromgplus.php:36
 #: ../../addon.old/fromgplus/fromgplus.php:32
 msgid "Enable Google+ Import"
 msgstr ""
 
-#: ../../addon/fromgplus/fromgplus.php:35
+#: ../../addon/fromgplus/fromgplus.php:39
 #: ../../addon.old/fromgplus/fromgplus.php:35
 msgid "Google Account ID"
 msgstr ""
 
-#: ../../addon/fromgplus/fromgplus.php:55
+#: ../../addon/fromgplus/fromgplus.php:59
 #: ../../addon.old/fromgplus/fromgplus.php:55
 msgid "Google+ Import Settings saved."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:523
+#: ../../addon/facebook/facebook.php:525
 #: ../../addon.old/facebook/facebook.php:523
 msgid "Facebook disabled"
 msgstr "Facebook废"
 
-#: ../../addon/facebook/facebook.php:528
+#: ../../addon/facebook/facebook.php:530
 #: ../../addon.old/facebook/facebook.php:528
 msgid "Updating contacts"
 msgstr "正才更新熟人"
 
-#: ../../addon/facebook/facebook.php:551 ../../addon/fbpost/fbpost.php:192
+#: ../../addon/facebook/facebook.php:553 ../../addon/fbpost/fbpost.php:203
 #: ../../addon.old/facebook/facebook.php:551
 #: ../../addon.old/fbpost/fbpost.php:192
 msgid "Facebook API key is missing."
 msgstr "Facebook API钥匙失踪的。"
 
-#: ../../addon/facebook/facebook.php:558
+#: ../../addon/facebook/facebook.php:560
 #: ../../addon.old/facebook/facebook.php:558
 msgid "Facebook Connect"
 msgstr "Facebook联络"
 
-#: ../../addon/facebook/facebook.php:564
+#: ../../addon/facebook/facebook.php:566
 #: ../../addon.old/facebook/facebook.php:564
 msgid "Install Facebook connector for this account."
 msgstr "安装Facebook连接器为这个账户。"
 
-#: ../../addon/facebook/facebook.php:571
+#: ../../addon/facebook/facebook.php:573
 #: ../../addon.old/facebook/facebook.php:571
 msgid "Remove Facebook connector"
 msgstr "删除Facebook连接器"
 
-#: ../../addon/facebook/facebook.php:576 ../../addon/fbpost/fbpost.php:217
+#: ../../addon/facebook/facebook.php:578 ../../addon/fbpost/fbpost.php:228
 #: ../../addon.old/facebook/facebook.php:576
 #: ../../addon.old/fbpost/fbpost.php:217
 msgid ""
@@ -4936,63 +5064,63 @@ msgid ""
 "changed.]"
 msgstr "复认证[这是必要的每当您Facebook密码变化了]"
 
-#: ../../addon/facebook/facebook.php:583 ../../addon/fbpost/fbpost.php:224
+#: ../../addon/facebook/facebook.php:585 ../../addon/fbpost/fbpost.php:235
 #: ../../addon.old/facebook/facebook.php:583
 #: ../../addon.old/fbpost/fbpost.php:224
 msgid "Post to Facebook by default"
 msgstr "默认地放在Facebook"
 
-#: ../../addon/facebook/facebook.php:589
+#: ../../addon/facebook/facebook.php:591
 #: ../../addon.old/facebook/facebook.php:589
 msgid ""
 "Facebook friend linking has been disabled on this site. The following "
 "settings will have no effect."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:593
+#: ../../addon/facebook/facebook.php:595
 #: ../../addon.old/facebook/facebook.php:593
 msgid ""
 "Facebook friend linking has been disabled on this site. If you disable it, "
 "you will be unable to re-enable it."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:596
+#: ../../addon/facebook/facebook.php:598
 #: ../../addon.old/facebook/facebook.php:596
 msgid "Link all your Facebook friends and conversations on this website"
 msgstr "连接您所有的Facebook朋友们和交流在这个网站"
 
-#: ../../addon/facebook/facebook.php:598
+#: ../../addon/facebook/facebook.php:600
 #: ../../addon.old/facebook/facebook.php:598
 msgid ""
 "Facebook conversations consist of your <em>profile wall</em> and your friend"
 " <em>stream</em>."
 msgstr "Facebook交流由您的<em>简介墙</em>和您朋友的<em>溪流</em>组成。 "
 
-#: ../../addon/facebook/facebook.php:599
+#: ../../addon/facebook/facebook.php:601
 #: ../../addon.old/facebook/facebook.php:599
 msgid "On this website, your Facebook friend stream is only visible to you."
 msgstr "在这个网站，您Facebook朋友溪流是只您可见的。"
 
-#: ../../addon/facebook/facebook.php:600
+#: ../../addon/facebook/facebook.php:602
 #: ../../addon.old/facebook/facebook.php:600
 msgid ""
 "The following settings determine the privacy of your Facebook profile wall "
 "on this website."
 msgstr "下面的设置决定您在这个网站Facebook简介墙的隐私。"
 
-#: ../../addon/facebook/facebook.php:604
+#: ../../addon/facebook/facebook.php:606
 #: ../../addon.old/facebook/facebook.php:604
 msgid ""
 "On this website your Facebook profile wall conversations will only be "
 "visible to you"
 msgstr "在这个网站您Facebook简介墙交流是只您可见的。"
 
-#: ../../addon/facebook/facebook.php:609
+#: ../../addon/facebook/facebook.php:611
 #: ../../addon.old/facebook/facebook.php:609
 msgid "Do not import your Facebook profile wall conversations"
 msgstr "别进口您Facebook简介墙交流"
 
-#: ../../addon/facebook/facebook.php:611
+#: ../../addon/facebook/facebook.php:613
 #: ../../addon.old/facebook/facebook.php:611
 msgid ""
 "If you choose to link conversations and leave both of these boxes unchecked,"
@@ -5001,28 +5129,40 @@ msgid ""
 "who may see the conversations."
 msgstr "如果您选择连接交流和留这两个复选框空则，您Facebook简介墙被在您这网站的简介墙融合和您的这网站隐私设置决定谁能看那些交流。"
 
-#: ../../addon/facebook/facebook.php:616
+#: ../../addon/facebook/facebook.php:618
 #: ../../addon.old/facebook/facebook.php:616
 msgid "Comma separated applications to ignore"
 msgstr "逗号分开的应用要不理"
 
-#: ../../addon/facebook/facebook.php:700
+#: ../../addon/facebook/facebook.php:702
 #: ../../addon.old/facebook/facebook.php:700
 msgid "Problems with Facebook Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:729
+#: ../../addon/facebook/facebook.php:704
+#: ../../addon/facebook/facebook.php:1202 ../../addon/fbpost/fbpost.php:821
+#: ../../addon/public_server/public_server.php:62
+#: ../../addon/testdrive/testdrive.php:67
+#: ../../addon.old/facebook/facebook.php:702
+#: ../../addon.old/facebook/facebook.php:1200
+#: ../../addon.old/fbpost/fbpost.php:661
+#: ../../addon.old/public_server/public_server.php:62
+#: ../../addon.old/testdrive/testdrive.php:67
+msgid "Administrator"
+msgstr "管理员"
+
+#: ../../addon/facebook/facebook.php:731
 #: ../../addon.old/facebook/facebook.php:729
 msgid "Facebook Connector Settings"
 msgstr "Facebook连接器设置"
 
-#: ../../addon/facebook/facebook.php:744 ../../addon/fbpost/fbpost.php:255
+#: ../../addon/facebook/facebook.php:746 ../../addon/fbpost/fbpost.php:310
 #: ../../addon.old/facebook/facebook.php:744
 #: ../../addon.old/fbpost/fbpost.php:255
 msgid "Facebook API Key"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:754 ../../addon/fbpost/fbpost.php:262
+#: ../../addon/facebook/facebook.php:756 ../../addon/fbpost/fbpost.php:317
 #: ../../addon.old/facebook/facebook.php:754
 #: ../../addon.old/fbpost/fbpost.php:262
 msgid ""
@@ -5031,76 +5171,76 @@ msgid ""
 "using this form.<br><br>"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:759
+#: ../../addon/facebook/facebook.php:761
 #: ../../addon.old/facebook/facebook.php:759
 msgid ""
 "Error: the given API Key seems to be incorrect (the application access token"
 " could not be retrieved)."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:761
+#: ../../addon/facebook/facebook.php:763
 #: ../../addon.old/facebook/facebook.php:761
 msgid "The given API Key seems to work correctly."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:763
+#: ../../addon/facebook/facebook.php:765
 #: ../../addon.old/facebook/facebook.php:763
 msgid ""
 "The correctness of the API Key could not be detected. Something strange's "
 "going on."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:766 ../../addon/fbpost/fbpost.php:264
+#: ../../addon/facebook/facebook.php:768 ../../addon/fbpost/fbpost.php:319
 #: ../../addon.old/facebook/facebook.php:766
 #: ../../addon.old/fbpost/fbpost.php:264
 msgid "App-ID / API-Key"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:767 ../../addon/fbpost/fbpost.php:265
+#: ../../addon/facebook/facebook.php:769 ../../addon/fbpost/fbpost.php:320
 #: ../../addon.old/facebook/facebook.php:767
 #: ../../addon.old/fbpost/fbpost.php:265
 msgid "Application secret"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:768
+#: ../../addon/facebook/facebook.php:770
 #: ../../addon.old/facebook/facebook.php:768
 #, php-format
 msgid "Polling Interval in minutes (minimum %1$s minutes)"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:769
+#: ../../addon/facebook/facebook.php:771
 #: ../../addon.old/facebook/facebook.php:769
 msgid ""
 "Synchronize comments (no comments on Facebook are missed, at the cost of "
 "increased system load)"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:773
+#: ../../addon/facebook/facebook.php:775
 #: ../../addon.old/facebook/facebook.php:773
 msgid "Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:777
+#: ../../addon/facebook/facebook.php:779
 #: ../../addon.old/facebook/facebook.php:777
 msgid "Real-Time Updates are activated."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:778
+#: ../../addon/facebook/facebook.php:780
 #: ../../addon.old/facebook/facebook.php:778
 msgid "Deactivate Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:780
+#: ../../addon/facebook/facebook.php:782
 #: ../../addon.old/facebook/facebook.php:780
 msgid "Real-Time Updates not activated."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:780
+#: ../../addon/facebook/facebook.php:782
 #: ../../addon.old/facebook/facebook.php:780
 msgid "Activate Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:799 ../../addon/fbpost/fbpost.php:282
+#: ../../addon/facebook/facebook.php:801 ../../addon/fbpost/fbpost.php:337
 #: ../../addon/dav/friendica/layout.fnk.php:361
 #: ../../addon.old/facebook/facebook.php:799
 #: ../../addon.old/fbpost/fbpost.php:282
@@ -5108,13 +5248,13 @@ msgstr ""
 msgid "The new values have been saved."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:823 ../../addon/fbpost/fbpost.php:301
+#: ../../addon/facebook/facebook.php:825 ../../addon/fbpost/fbpost.php:356
 #: ../../addon.old/facebook/facebook.php:823
 #: ../../addon.old/fbpost/fbpost.php:301
 msgid "Post to Facebook"
 msgstr "放在Facebook"
 
-#: ../../addon/facebook/facebook.php:921 ../../addon/fbpost/fbpost.php:399
+#: ../../addon/facebook/facebook.php:923 ../../addon/fbpost/fbpost.php:487
 #: ../../addon.old/facebook/facebook.php:921
 #: ../../addon.old/fbpost/fbpost.php:399
 msgid ""
@@ -5122,31 +5262,31 @@ msgid ""
 "conflict."
 msgstr "发送到Facebook取消由于多网络准许矛盾。"
 
-#: ../../addon/facebook/facebook.php:1149 ../../addon/fbpost/fbpost.php:610
+#: ../../addon/facebook/facebook.php:1151 ../../addon/fbpost/fbpost.php:766
 #: ../../addon.old/facebook/facebook.php:1149
 #: ../../addon.old/fbpost/fbpost.php:610
 msgid "View on Friendica"
 msgstr "看在Friendica"
 
-#: ../../addon/facebook/facebook.php:1182 ../../addon/fbpost/fbpost.php:643
+#: ../../addon/facebook/facebook.php:1184 ../../addon/fbpost/fbpost.php:803
 #: ../../addon.old/facebook/facebook.php:1182
 #: ../../addon.old/fbpost/fbpost.php:643
 msgid "Facebook post failed. Queued for retry."
 msgstr "Facebook发送失败了。排队着待再试。"
 
-#: ../../addon/facebook/facebook.php:1222 ../../addon/fbpost/fbpost.php:683
+#: ../../addon/facebook/facebook.php:1224 ../../addon/fbpost/fbpost.php:843
 #: ../../addon.old/facebook/facebook.php:1222
 #: ../../addon.old/fbpost/fbpost.php:683
 msgid "Your Facebook connection became invalid. Please Re-authenticate."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1223 ../../addon/fbpost/fbpost.php:684
+#: ../../addon/facebook/facebook.php:1225 ../../addon/fbpost/fbpost.php:844
 #: ../../addon.old/facebook/facebook.php:1223
 #: ../../addon.old/fbpost/fbpost.php:684
 msgid "Facebook connection became invalid"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1224 ../../addon/fbpost/fbpost.php:685
+#: ../../addon/facebook/facebook.php:1226 ../../addon/fbpost/fbpost.php:845
 #: ../../addon.old/facebook/facebook.php:1224
 #: ../../addon.old/fbpost/fbpost.php:685
 #, php-format
@@ -5171,59 +5311,76 @@ msgstr ""
 msgid "Automatically follow any StatusNet followers/mentioners"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:260
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:351
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:260
 msgid "Lifetime of the cache (in hours)"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:265
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:356
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:265
 msgid "Cache Statistics"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:268
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:359
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:268
 msgid "Number of items"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:270
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:361
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:270
 msgid "Size of the cache"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:272
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:363
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:272
 msgid "Delete the whole cache"
 msgstr ""
 
-#: ../../addon/fbpost/fbpost.php:172 ../../addon.old/fbpost/fbpost.php:172
+#: ../../addon/fbpost/fbpost.php:183 ../../addon.old/fbpost/fbpost.php:172
 msgid "Facebook Post disabled"
 msgstr ""
 
-#: ../../addon/fbpost/fbpost.php:199 ../../addon.old/fbpost/fbpost.php:199
+#: ../../addon/fbpost/fbpost.php:210 ../../addon.old/fbpost/fbpost.php:199
 msgid "Facebook Post"
 msgstr ""
 
-#: ../../addon/fbpost/fbpost.php:205 ../../addon.old/fbpost/fbpost.php:205
+#: ../../addon/fbpost/fbpost.php:216 ../../addon.old/fbpost/fbpost.php:205
 msgid "Install Facebook Post connector for this account."
 msgstr ""
 
-#: ../../addon/fbpost/fbpost.php:212 ../../addon.old/fbpost/fbpost.php:212
+#: ../../addon/fbpost/fbpost.php:223 ../../addon.old/fbpost/fbpost.php:212
 msgid "Remove Facebook Post connector"
 msgstr ""
 
-#: ../../addon/fbpost/fbpost.php:240 ../../addon.old/fbpost/fbpost.php:240
+#: ../../addon/fbpost/fbpost.php:239
+msgid "Suppress \"View on friendica\""
+msgstr ""
+
+#: ../../addon/fbpost/fbpost.php:243
+msgid "Mirror wall posts from facebook to friendica."
+msgstr ""
+
+#: ../../addon/fbpost/fbpost.php:253
+msgid "Post to page/group:"
+msgstr ""
+
+#: ../../addon/fbpost/fbpost.php:295 ../../addon.old/fbpost/fbpost.php:240
 msgid "Facebook Post Settings"
 msgstr ""
 
-#: ../../addon/widgets/widget_like.php:58
+#: ../../addon/fbpost/fbpost.php:375
+#, php-format
+msgid "%s:"
+msgstr ""
+
+#: ../../addon/widgets/widget_like.php:59
 #: ../../addon.old/widgets/widget_like.php:58
 #, php-format
 msgid "%d person likes this"
 msgid_plural "%d people like this"
 msgstr[0] "%d人喜欢这个"
 
-#: ../../addon/widgets/widget_like.php:61
+#: ../../addon/widgets/widget_like.php:62
 #: ../../addon.old/widgets/widget_like.php:61
 #, php-format
 msgid "%d person doesn't like this"
@@ -5235,15 +5392,15 @@ msgstr[0] "%d人不喜欢这个"
 msgid "Get added to this list!"
 msgstr ""
 
-#: ../../addon/widgets/widgets.php:56 ../../addon.old/widgets/widgets.php:56
+#: ../../addon/widgets/widgets.php:57 ../../addon.old/widgets/widgets.php:56
 msgid "Generate new key"
 msgstr "造成新钥匙"
 
-#: ../../addon/widgets/widgets.php:59 ../../addon.old/widgets/widgets.php:59
+#: ../../addon/widgets/widgets.php:60 ../../addon.old/widgets/widgets.php:59
 msgid "Widgets key"
 msgstr "小窗口钥匙"
 
-#: ../../addon/widgets/widgets.php:61 ../../addon.old/widgets/widgets.php:61
+#: ../../addon/widgets/widgets.php:62 ../../addon.old/widgets/widgets.php:61
 msgid "Widgets available"
 msgstr "可用的小窗口"
 
@@ -5437,27 +5594,27 @@ msgstr ""
 
 #: ../../addon/yourls/yourls.php:55 ../../addon.old/yourls/yourls.php:55
 msgid "YourLS Settings"
-msgstr ""
+msgstr "YourLS配置"
 
 #: ../../addon/yourls/yourls.php:57 ../../addon.old/yourls/yourls.php:57
 msgid "URL: http://"
-msgstr ""
+msgstr "URL: http://"
 
 #: ../../addon/yourls/yourls.php:62 ../../addon.old/yourls/yourls.php:62
 msgid "Username:"
-msgstr ""
+msgstr "用户名："
 
 #: ../../addon/yourls/yourls.php:67 ../../addon.old/yourls/yourls.php:67
 msgid "Password:"
-msgstr ""
+msgstr "密码："
 
 #: ../../addon/yourls/yourls.php:72 ../../addon.old/yourls/yourls.php:72
 msgid "Use SSL "
-msgstr ""
+msgstr "用SSL"
 
 #: ../../addon/yourls/yourls.php:92 ../../addon.old/yourls/yourls.php:92
 msgid "yourls Settings saved."
-msgstr ""
+msgstr "yourls配置保存了。"
 
 #: ../../addon/ljpost/ljpost.php:39 ../../addon.old/ljpost/ljpost.php:39
 msgid "Post to LiveJournal"
@@ -5507,7 +5664,7 @@ msgstr ""
 
 #: ../../addon/nsfw/nsfw.php:89 ../../addon.old/nsfw/nsfw.php:89
 msgid "Use /expression/ to provide regular expressions"
-msgstr ""
+msgstr "用/<i>表达式</i>/为输入正则表达式"
 
 #: ../../addon/nsfw/nsfw.php:105 ../../addon.old/nsfw/nsfw.php:105
 msgid "NSFW Settings saved."
@@ -5519,12 +5676,12 @@ msgid "%s - Click to open/close"
 msgstr "%s - 点击为打开／关闭"
 
 #: ../../addon/page/page.php:62 ../../addon/page/page.php:92
-#: ../../addon/forumlist/forumlist.php:60 ../../addon.old/page/page.php:62
+#: ../../addon/forumlist/forumlist.php:64 ../../addon.old/page/page.php:62
 #: ../../addon.old/page/page.php:92 ../../addon.old/forumlist/forumlist.php:60
 msgid "Forums"
 msgstr ""
 
-#: ../../addon/page/page.php:130 ../../addon/forumlist/forumlist.php:94
+#: ../../addon/page/page.php:130 ../../addon/forumlist/forumlist.php:98
 #: ../../addon.old/page/page.php:130
 #: ../../addon.old/forumlist/forumlist.php:94
 msgid "Forums:"
@@ -5558,12 +5715,13 @@ msgstr ""
 msgid "Enable Planets Plugin"
 msgstr ""
 
+#: ../../addon/forumdirectory/forumdirectory.php:22
+msgid "Forum Directory"
+msgstr ""
+
 #: ../../addon/communityhome/communityhome.php:28
-#: ../../addon/communityhome/communityhome.php:34
-#: ../../addon/communityhome/twillingham/communityhome.php:28
-#: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:947
-#: ../../addon.old/communityhome/communityhome.php:28
+#: ../../addon/communityhome/communityhome.php:34 ../../include/nav.php:64
+#: ../../boot.php:1008 ../../addon.old/communityhome/communityhome.php:28
 #: ../../addon.old/communityhome/communityhome.php:34
 #: ../../addon.old/communityhome/twillingham/communityhome.php:28
 #: ../../addon.old/communityhome/twillingham/communityhome.php:34
@@ -5571,38 +5729,35 @@ msgid "Login"
 msgstr "登录"
 
 #: ../../addon/communityhome/communityhome.php:29
-#: ../../addon/communityhome/twillingham/communityhome.php:29
 #: ../../addon.old/communityhome/communityhome.php:29
 #: ../../addon.old/communityhome/twillingham/communityhome.php:29
 msgid "OpenID"
 msgstr "OpenID"
 
-#: ../../addon/communityhome/communityhome.php:38
-#: ../../addon/communityhome/twillingham/communityhome.php:38
+#: ../../addon/communityhome/communityhome.php:39
 #: ../../addon.old/communityhome/communityhome.php:38
 #: ../../addon.old/communityhome/twillingham/communityhome.php:38
 msgid "Latest users"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:81
-#: ../../addon/communityhome/twillingham/communityhome.php:81
+#: ../../addon/communityhome/communityhome.php:84
 #: ../../addon.old/communityhome/communityhome.php:81
 #: ../../addon.old/communityhome/twillingham/communityhome.php:81
 msgid "Most active users"
 msgstr "最积极用户"
 
-#: ../../addon/communityhome/communityhome.php:98
+#: ../../addon/communityhome/communityhome.php:102
 #: ../../addon.old/communityhome/communityhome.php:98
 msgid "Latest photos"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:133
+#: ../../addon/communityhome/communityhome.php:141
 #: ../../addon.old/communityhome/communityhome.php:133
 msgid "Latest likes"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:155
-#: ../../view/theme/diabook/theme.php:493 ../../include/text.php:1440
+#: ../../addon/communityhome/communityhome.php:163
+#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1496
 #: ../../include/conversation.php:117 ../../include/conversation.php:245
 #: ../../addon.old/communityhome/communityhome.php:155
 msgid "event"
@@ -5756,7 +5911,7 @@ msgstr ""
 #: ../../addon/dav/common/wdcal_edit.inc.php:254
 #: ../../addon/dav/common/wdcal_edit.inc.php:270
 #: ../../addon/dav/common/wdcal_edit.inc.php:293
-#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:975
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:231
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:254
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:270
@@ -5767,7 +5922,7 @@ msgstr "星期天"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:235
 #: ../../addon/dav/common/wdcal_edit.inc.php:274
-#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:975
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:235
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:274
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:308
@@ -5775,35 +5930,35 @@ msgid "Monday"
 msgstr "星期一"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:238
-#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:975
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:238
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:277
 msgid "Tuesday"
 msgstr "星期二"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:241
-#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:975
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:241
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:280
 msgid "Wednesday"
 msgstr "星期三"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:244
-#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:975
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:244
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:283
 msgid "Thursday"
 msgstr "星期四"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:247
-#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:975
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:247
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:286
 msgid "Friday"
 msgstr "星期五"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:250
-#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:975
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:250
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:289
 msgid "Saturday"
@@ -6170,8 +6325,8 @@ msgid "Extended calendar with CalDAV-support"
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:279
-#: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:464
-#: ../../include/enotify.php:28 ../../include/notifier.php:774
+#: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:468
+#: ../../include/enotify.php:28 ../../include/notifier.php:781
 #: ../../addon.old/dav/friendica/main.php:279
 #: ../../addon.old/dav/friendica/main.php:280
 msgid "noreply"
@@ -6309,27 +6464,27 @@ msgid ""
 " storage (like ownCloud). See <a "
 "href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage"
 " WebFinger</a>"
-msgstr ""
+msgstr "许用您的friendica用户名（%s）根对外没主办的贮藏（比如ownCloud）。看<a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"
 
 #: ../../addon/uhremotestorage/uhremotestorage.php:85
 #: ../../addon.old/uhremotestorage/uhremotestorage.php:85
 msgid "Template URL (with {category})"
-msgstr ""
+msgstr "模板URL（根{category}）"
 
 #: ../../addon/uhremotestorage/uhremotestorage.php:86
 #: ../../addon.old/uhremotestorage/uhremotestorage.php:86
 msgid "OAuth end-point"
-msgstr ""
+msgstr "OAuth 端点"
 
 #: ../../addon/uhremotestorage/uhremotestorage.php:87
 #: ../../addon.old/uhremotestorage/uhremotestorage.php:87
 msgid "Api"
-msgstr ""
+msgstr "API"
 
 #: ../../addon/membersince/membersince.php:18
 #: ../../addon.old/membersince/membersince.php:18
 msgid "Member since:"
-msgstr ""
+msgstr "客人从："
 
 #: ../../addon/tictac/tictac.php:20 ../../addon.old/tictac/tictac.php:20
 msgid "Three Dimensional Tic-Tac-Toe"
@@ -6420,41 +6575,43 @@ msgstr ""
 msgid "Post to dreamwidth by default"
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:44
+#: ../../addon/remote_permissions/remote_permissions.php:45
 msgid "Remote Permissions Settings"
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:45
+#: ../../addon/remote_permissions/remote_permissions.php:46
 msgid ""
 "Allow recipients of your private posts to see the other recipients of the "
 "posts"
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:57
+#: ../../addon/remote_permissions/remote_permissions.php:58
 msgid "Remote Permissions settings updated."
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:177
+#: ../../addon/remote_permissions/remote_permissions.php:178
 msgid "Visible to"
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:177
+#: ../../addon/remote_permissions/remote_permissions.php:178
 msgid "may only be a partial list"
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:196
+#: ../../addon/remote_permissions/remote_permissions.php:197
+#: ../../addon/altpager/altpager.php:99
 msgid "Global"
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:196
+#: ../../addon/remote_permissions/remote_permissions.php:197
 msgid "The posts of every user on this server show the post recipients"
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:197
+#: ../../addon/remote_permissions/remote_permissions.php:198
+#: ../../addon/altpager/altpager.php:100
 msgid "Individual"
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:197
+#: ../../addon/remote_permissions/remote_permissions.php:198
 msgid "Each user chooses whether his/her posts show the post recipients"
 msgstr ""
 
@@ -6476,17 +6633,17 @@ msgstr ""
 #: ../../addon/geonames/geonames.php:143
 #: ../../addon.old/geonames/geonames.php:143
 msgid "Geonames settings updated."
-msgstr ""
+msgstr "Geonames设置更新了。"
 
 #: ../../addon/geonames/geonames.php:179
 #: ../../addon.old/geonames/geonames.php:179
 msgid "Geonames Settings"
-msgstr ""
+msgstr "Geonames设置"
 
 #: ../../addon/geonames/geonames.php:181
 #: ../../addon.old/geonames/geonames.php:181
 msgid "Enable Geonames Plugin"
-msgstr ""
+msgstr "使Geonames插件能用"
 
 #: ../../addon/public_server/public_server.php:126
 #: ../../addon/testdrive/testdrive.php:94
@@ -6525,57 +6682,57 @@ msgstr "在这儿放文件为上传"
 msgid "Failed"
 msgstr "失败"
 
-#: ../../addon/js_upload/js_upload.php:297
+#: ../../addon/js_upload/js_upload.php:303
 #: ../../addon.old/js_upload/js_upload.php:297
 msgid "No files were uploaded."
 msgstr "没有文件上传。"
 
-#: ../../addon/js_upload/js_upload.php:303
+#: ../../addon/js_upload/js_upload.php:309
 #: ../../addon.old/js_upload/js_upload.php:303
 msgid "Uploaded file is empty"
 msgstr "上传的文件空的"
 
-#: ../../addon/js_upload/js_upload.php:326
+#: ../../addon/js_upload/js_upload.php:332
 #: ../../addon.old/js_upload/js_upload.php:326
 msgid "File has an invalid extension, it should be one of "
 msgstr "文件扩展名无效的，应该是这些一个："
 
-#: ../../addon/js_upload/js_upload.php:337
+#: ../../addon/js_upload/js_upload.php:343
 #: ../../addon.old/js_upload/js_upload.php:337
 msgid "Upload was cancelled, or server error encountered"
 msgstr "上传注销了，或相遇服务器错误"
 
-#: ../../addon/forumlist/forumlist.php:63
+#: ../../addon/forumlist/forumlist.php:67
 #: ../../addon.old/forumlist/forumlist.php:63
 msgid "show/hide"
 msgstr ""
 
-#: ../../addon/forumlist/forumlist.php:77
+#: ../../addon/forumlist/forumlist.php:81
 #: ../../addon.old/forumlist/forumlist.php:77
 msgid "No forum subscriptions"
 msgstr ""
 
-#: ../../addon/forumlist/forumlist.php:131
+#: ../../addon/forumlist/forumlist.php:134
 #: ../../addon.old/forumlist/forumlist.php:131
 msgid "Forumlist settings updated."
 msgstr ""
 
-#: ../../addon/forumlist/forumlist.php:159
+#: ../../addon/forumlist/forumlist.php:162
 #: ../../addon.old/forumlist/forumlist.php:159
 msgid "Forumlist Settings"
 msgstr ""
 
-#: ../../addon/forumlist/forumlist.php:161
+#: ../../addon/forumlist/forumlist.php:164
 #: ../../addon.old/forumlist/forumlist.php:161
 msgid "Randomise forum list"
 msgstr ""
 
-#: ../../addon/forumlist/forumlist.php:164
+#: ../../addon/forumlist/forumlist.php:167
 #: ../../addon.old/forumlist/forumlist.php:164
 msgid "Show forums on profile page"
 msgstr ""
 
-#: ../../addon/forumlist/forumlist.php:167
+#: ../../addon/forumlist/forumlist.php:170
 #: ../../addon.old/forumlist/forumlist.php:167
 msgid "Show forums on network page"
 msgstr ""
@@ -6684,52 +6841,52 @@ msgstr ""
 
 #: ../../addon/blockem/blockem.php:51 ../../addon.old/blockem/blockem.php:51
 msgid "\"Blockem\" Settings"
-msgstr ""
+msgstr "「Blockem」配置"
 
 #: ../../addon/blockem/blockem.php:53 ../../addon.old/blockem/blockem.php:53
 msgid "Comma separated profile URLS to block"
-msgstr ""
+msgstr "逗号分简介URL为栏"
 
 #: ../../addon/blockem/blockem.php:70 ../../addon.old/blockem/blockem.php:70
 msgid "BLOCKEM Settings saved."
-msgstr ""
+msgstr "「Blockem」配置保存了。"
 
 #: ../../addon/blockem/blockem.php:105 ../../addon.old/blockem/blockem.php:105
 #, php-format
 msgid "Blocked %s - Click to open/close"
-msgstr ""
+msgstr "%s拦了－点击为开关"
 
 #: ../../addon/blockem/blockem.php:160 ../../addon.old/blockem/blockem.php:160
 msgid "Unblock Author"
-msgstr ""
+msgstr "不拦作家"
 
 #: ../../addon/blockem/blockem.php:162 ../../addon.old/blockem/blockem.php:162
 msgid "Block Author"
-msgstr ""
+msgstr "拦作家"
 
 #: ../../addon/blockem/blockem.php:194 ../../addon.old/blockem/blockem.php:194
 msgid "blockem settings updated"
-msgstr ""
+msgstr "blockem设置更新了"
 
 #: ../../addon/qcomment/qcomment.php:51
 #: ../../addon.old/qcomment/qcomment.php:51
 msgid ":-)"
-msgstr ""
+msgstr ":-)"
 
 #: ../../addon/qcomment/qcomment.php:51
 #: ../../addon.old/qcomment/qcomment.php:51
 msgid ":-("
-msgstr ""
+msgstr ":-("
 
 #: ../../addon/qcomment/qcomment.php:51
 #: ../../addon.old/qcomment/qcomment.php:51
 msgid "lol"
-msgstr ""
+msgstr "lol"
 
 #: ../../addon/qcomment/qcomment.php:54
 #: ../../addon.old/qcomment/qcomment.php:54
 msgid "Quick Comment Settings"
-msgstr ""
+msgstr "快捷评论设置"
 
 #: ../../addon/qcomment/qcomment.php:56
 #: ../../addon.old/qcomment/qcomment.php:56
@@ -6741,40 +6898,37 @@ msgstr ""
 #: ../../addon/qcomment/qcomment.php:57
 #: ../../addon.old/qcomment/qcomment.php:57
 msgid "Enter quick comments, one per line"
-msgstr ""
+msgstr "输入快捷评论，一行一个"
 
 #: ../../addon/qcomment/qcomment.php:75
 #: ../../addon.old/qcomment/qcomment.php:75
 msgid "Quick Comment settings saved."
-msgstr ""
+msgstr "快捷评论设置保存了。"
 
-#: ../../addon/openstreetmap/openstreetmap.php:71
+#: ../../addon/openstreetmap/openstreetmap.php:95
 #: ../../addon.old/openstreetmap/openstreetmap.php:71
 msgid "Tile Server URL"
-msgstr ""
+msgstr "砖服务器URL"
 
-#: ../../addon/openstreetmap/openstreetmap.php:71
+#: ../../addon/openstreetmap/openstreetmap.php:95
 #: ../../addon.old/openstreetmap/openstreetmap.php:71
 msgid ""
 "A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" "
 "target=\"_blank\">public tile servers</a>"
-msgstr ""
+msgstr "一单<a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">公共砖服务器</a>"
 
-#: ../../addon/openstreetmap/openstreetmap.php:72
+#: ../../addon/openstreetmap/openstreetmap.php:96
 #: ../../addon.old/openstreetmap/openstreetmap.php:72
 msgid "Default zoom"
-msgstr ""
+msgstr "默认变焦距"
 
-#: ../../addon/openstreetmap/openstreetmap.php:72
+#: ../../addon/openstreetmap/openstreetmap.php:96
 #: ../../addon.old/openstreetmap/openstreetmap.php:72
 msgid "The default zoom level. (1:world, 18:highest)"
-msgstr ""
+msgstr "默认变焦距。(1:世界, 18:最高)"
 
 #: ../../addon/group_text/group_text.php:46
-#: ../../addon/editplain/editplain.php:46
-#: ../../addon.old/group_text/group_text.php:46
-#: ../../addon.old/editplain/editplain.php:46
-msgid "Editplain settings updated."
+msgid "Group Text settings updated."
 msgstr ""
 
 #: ../../addon/group_text/group_text.php:76
@@ -6905,16 +7059,24 @@ msgstr ""
 msgid "Altpager settings updated."
 msgstr ""
 
-#: ../../addon/altpager/altpager.php:79
+#: ../../addon/altpager/altpager.php:83
 #: ../../addon.old/altpager/altpager.php:79
 msgid "Alternate Pagination Setting"
 msgstr ""
 
-#: ../../addon/altpager/altpager.php:81
+#: ../../addon/altpager/altpager.php:85
 #: ../../addon.old/altpager/altpager.php:81
 msgid "Use links to \"newer\" and \"older\" pages in place of page numbers?"
 msgstr ""
 
+#: ../../addon/altpager/altpager.php:99
+msgid "Force global use of the alternate pager"
+msgstr ""
+
+#: ../../addon/altpager/altpager.php:100
+msgid "Each user chooses whether to use the alternate pager"
+msgstr ""
+
 #: ../../addon/mathjax/mathjax.php:37 ../../addon.old/mathjax/mathjax.php:37
 msgid ""
 "The MathJax addon renders mathematical formulae written using the LaTeX "
@@ -6926,25 +7088,31 @@ msgstr ""
 msgid "Use the MathJax renderer"
 msgstr ""
 
-#: ../../addon/mathjax/mathjax.php:74 ../../addon.old/mathjax/mathjax.php:74
+#: ../../addon/mathjax/mathjax.php:75 ../../addon.old/mathjax/mathjax.php:74
 msgid "MathJax Base URL"
 msgstr ""
 
-#: ../../addon/mathjax/mathjax.php:74 ../../addon.old/mathjax/mathjax.php:74
+#: ../../addon/mathjax/mathjax.php:75 ../../addon.old/mathjax/mathjax.php:74
 msgid ""
 "The URL for the javascript file that should be included to use MathJax. Can "
 "be either the MathJax CDN or another installation of MathJax."
 msgstr ""
 
+#: ../../addon/editplain/editplain.php:46
+#: ../../addon.old/group_text/group_text.php:46
+#: ../../addon.old/editplain/editplain.php:46
+msgid "Editplain settings updated."
+msgstr "Editplain设置更新了"
+
 #: ../../addon/editplain/editplain.php:76
 #: ../../addon.old/editplain/editplain.php:76
 msgid "Editplain Settings"
-msgstr ""
+msgstr "Editplain设置"
 
 #: ../../addon/editplain/editplain.php:78
 #: ../../addon.old/editplain/editplain.php:78
 msgid "Disable richtext status editor"
-msgstr ""
+msgstr "使richtext现状编辑 不能用"
 
 #: ../../addon/gravatar/gravatar.php:89
 #: ../../addon.old/gravatar/gravatar.php:89
@@ -6996,7 +7164,7 @@ msgstr "\"pageheader"
 #: ../../addon/pageheader/pageheader.php:68
 #: ../../addon.old/pageheader/pageheader.php:68
 msgid "pageheader Settings saved."
-msgstr ""
+msgstr "pageHeader配置保存了。"
 
 #: ../../addon/ijpost/ijpost.php:39 ../../addon.old/ijpost/ijpost.php:39
 msgid "Post to Insanejournal"
@@ -7090,41 +7258,41 @@ msgstr ""
 
 #: ../../addon/viewsrc/viewsrc.php:37 ../../addon.old/viewsrc/viewsrc.php:37
 msgid "View Source"
-msgstr ""
+msgstr "看源代码"
 
-#: ../../addon/statusnet/statusnet.php:134
+#: ../../addon/statusnet/statusnet.php:138
 #: ../../addon.old/statusnet/statusnet.php:134
 msgid "Post to StatusNet"
 msgstr "发送到StatusNet"
 
-#: ../../addon/statusnet/statusnet.php:176
+#: ../../addon/statusnet/statusnet.php:180
 #: ../../addon.old/statusnet/statusnet.php:176
 msgid ""
 "Please contact your site administrator.<br />The provided API URL is not "
 "valid."
 msgstr "请联系您的网站行政人员。<br />提供的API URL无效。"
 
-#: ../../addon/statusnet/statusnet.php:204
+#: ../../addon/statusnet/statusnet.php:208
 #: ../../addon.old/statusnet/statusnet.php:204
 msgid "We could not contact the StatusNet API with the Path you entered."
 msgstr "我们不能联系StatusNet API在您输入的路径。"
 
-#: ../../addon/statusnet/statusnet.php:232
+#: ../../addon/statusnet/statusnet.php:238
 #: ../../addon.old/statusnet/statusnet.php:232
 msgid "StatusNet settings updated."
 msgstr "StatusNet设置更新了。"
 
-#: ../../addon/statusnet/statusnet.php:257
+#: ../../addon/statusnet/statusnet.php:269
 #: ../../addon.old/statusnet/statusnet.php:257
 msgid "StatusNet Posting Settings"
 msgstr "StatusNet发送设置"
 
-#: ../../addon/statusnet/statusnet.php:271
+#: ../../addon/statusnet/statusnet.php:283
 #: ../../addon.old/statusnet/statusnet.php:271
 msgid "Globally Available StatusNet OAuthKeys"
 msgstr "综合可用的StatusNet OAuthKeys"
 
-#: ../../addon/statusnet/statusnet.php:272
+#: ../../addon/statusnet/statusnet.php:284
 #: ../../addon.old/statusnet/statusnet.php:272
 msgid ""
 "There are preconfigured OAuth key pairs for some StatusNet servers "
@@ -7132,12 +7300,12 @@ msgid ""
 "not feel free to connect to any other StatusNet instance (see below)."
 msgstr "有已经装配的OAuth钥匙双于有的StatusNet服务器可用。如果您用那些之一，请用那个。否则随便连接任何别的StatusNet（看下）。"
 
-#: ../../addon/statusnet/statusnet.php:280
+#: ../../addon/statusnet/statusnet.php:292
 #: ../../addon.old/statusnet/statusnet.php:280
 msgid "Provide your own OAuth Credentials"
 msgstr "提供您自己的OAuth证件"
 
-#: ../../addon/statusnet/statusnet.php:281
+#: ../../addon/statusnet/statusnet.php:293
 #: ../../addon.old/statusnet/statusnet.php:281
 msgid ""
 "No consumer key pair for StatusNet found. Register your Friendica Account as"
@@ -7147,22 +7315,22 @@ msgid ""
 "Friendica installation at your favorited StatusNet installation."
 msgstr "找不到「consumer key」双为StatusNet。注册您Friendica账户当「desktop client」在您的StatusNet账户，粘贴「consumer key」双这儿和输入API基础根。<br />您登记您的OAuth钥匙双前问行政人员已经有没有钥匙双为这个Friendica安装在您最喜欢的StatusNet安装。"
 
-#: ../../addon/statusnet/statusnet.php:283
+#: ../../addon/statusnet/statusnet.php:295
 #: ../../addon.old/statusnet/statusnet.php:283
 msgid "OAuth Consumer Key"
 msgstr "Oauth消费者钥匙"
 
-#: ../../addon/statusnet/statusnet.php:286
+#: ../../addon/statusnet/statusnet.php:298
 #: ../../addon.old/statusnet/statusnet.php:286
 msgid "OAuth Consumer Secret"
 msgstr "Oauth消费者密码"
 
-#: ../../addon/statusnet/statusnet.php:289
+#: ../../addon/statusnet/statusnet.php:301
 #: ../../addon.old/statusnet/statusnet.php:289
 msgid "Base API Path (remember the trailing /)"
 msgstr "基础API地址(注意最后的／)"
 
-#: ../../addon/statusnet/statusnet.php:310
+#: ../../addon/statusnet/statusnet.php:322
 #: ../../addon.old/statusnet/statusnet.php:310
 msgid ""
 "To connect to your StatusNet account click the button below to get a "
@@ -7171,38 +7339,38 @@ msgid ""
 " to StatusNet."
 msgstr "为连接您的StatusNet账户点击下按钮得到安全密码从StatusNet您要在输入在下个栏和提交表单。只您的公开文章被送到StatusNet。"
 
-#: ../../addon/statusnet/statusnet.php:311
+#: ../../addon/statusnet/statusnet.php:323
 #: ../../addon.old/statusnet/statusnet.php:311
 msgid "Log in with StatusNet"
 msgstr "用StatusNet登记"
 
-#: ../../addon/statusnet/statusnet.php:313
+#: ../../addon/statusnet/statusnet.php:325
 #: ../../addon.old/statusnet/statusnet.php:313
 msgid "Copy the security code from StatusNet here"
 msgstr "复制安全密码从StatusNet这儿"
 
-#: ../../addon/statusnet/statusnet.php:319
+#: ../../addon/statusnet/statusnet.php:331
 #: ../../addon.old/statusnet/statusnet.php:319
 msgid "Cancel Connection Process"
 msgstr "注销连接过程 "
 
-#: ../../addon/statusnet/statusnet.php:321
+#: ../../addon/statusnet/statusnet.php:333
 #: ../../addon.old/statusnet/statusnet.php:321
 msgid "Current StatusNet API is"
 msgstr "现在StatusNet API是"
 
-#: ../../addon/statusnet/statusnet.php:322
+#: ../../addon/statusnet/statusnet.php:334
 #: ../../addon.old/statusnet/statusnet.php:322
 msgid "Cancel StatusNet Connection"
 msgstr "注销StatusNet连接"
 
-#: ../../addon/statusnet/statusnet.php:333 ../../addon/twitter/twitter.php:189
+#: ../../addon/statusnet/statusnet.php:345 ../../addon/twitter/twitter.php:200
 #: ../../addon.old/statusnet/statusnet.php:333
 #: ../../addon.old/twitter/twitter.php:189
 msgid "Currently connected to: "
 msgstr "现在连接到："
 
-#: ../../addon/statusnet/statusnet.php:334
+#: ../../addon/statusnet/statusnet.php:346
 #: ../../addon.old/statusnet/statusnet.php:334
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
@@ -7210,37 +7378,46 @@ msgid ""
 "for every posting separately in the posting options when writing the entry."
 msgstr "如果使可用的都您<strong>公开的</strong>文章会被发送到有关的StatusNet账户。您会选择默认地这样做（这儿）或个文章分开地写字时候选择在文章设置。"
 
-#: ../../addon/statusnet/statusnet.php:336
+#: ../../addon/statusnet/statusnet.php:348
 #: ../../addon.old/statusnet/statusnet.php:336
 msgid ""
 "<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
 "details from unknown viewers?</em>) the link potentially included in public "
 "postings relayed to StatusNet will lead the visitor to a blank page "
 "informing the visitor that the access to your profile has been restricted."
-msgstr ""
+msgstr "<strong>注意</strong>: 由于您的隐私设置(<em>隐藏您的简介内容为生看者？</em>)超链接可能包括在公文章转播到StatusNets会带领来客到空白页讲他看您的简介被限制。"
 
-#: ../../addon/statusnet/statusnet.php:339
+#: ../../addon/statusnet/statusnet.php:351
 #: ../../addon.old/statusnet/statusnet.php:339
 msgid "Allow posting to StatusNet"
 msgstr "许放在StatusNet"
 
-#: ../../addon/statusnet/statusnet.php:342
+#: ../../addon/statusnet/statusnet.php:354
 #: ../../addon.old/statusnet/statusnet.php:342
 msgid "Send public postings to StatusNet by default"
 msgstr "默认发送公开文章在StatusNet"
 
-#: ../../addon/statusnet/statusnet.php:345
+#: ../../addon/statusnet/statusnet.php:358
+msgid ""
+"Mirror all posts from statusnet that are no replies or repeated messages"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:362
+msgid "Shortening method that optimizes the post"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:366
 #: ../../addon.old/statusnet/statusnet.php:345
 msgid "Send linked #-tags and @-names to StatusNet"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:350 ../../addon/twitter/twitter.php:206
+#: ../../addon/statusnet/statusnet.php:371 ../../addon/twitter/twitter.php:226
 #: ../../addon.old/statusnet/statusnet.php:350
 #: ../../addon.old/twitter/twitter.php:206
 msgid "Clear OAuth configuration"
 msgstr "清理出OAuth设置"
 
-#: ../../addon/statusnet/statusnet.php:568
+#: ../../addon/statusnet/statusnet.php:745
 #: ../../addon.old/statusnet/statusnet.php:568
 msgid "API URL"
 msgstr "API URL"
@@ -7250,44 +7427,56 @@ msgstr "API URL"
 msgid "Infinite Improbability Drive"
 msgstr ""
 
-#: ../../addon/tumblr/tumblr.php:36 ../../addon.old/tumblr/tumblr.php:36
+#: ../../addon/tumblr/tumblr.php:144
+msgid "You are now authenticated to tumblr."
+msgstr ""
+
+#: ../../addon/tumblr/tumblr.php:145
+msgid "return to the connector page"
+msgstr ""
+
+#: ../../addon/tumblr/tumblr.php:158 ../../addon.old/tumblr/tumblr.php:36
 msgid "Post to Tumblr"
 msgstr "发送到Tumblr"
 
-#: ../../addon/tumblr/tumblr.php:67 ../../addon.old/tumblr/tumblr.php:67
+#: ../../addon/tumblr/tumblr.php:185 ../../addon.old/tumblr/tumblr.php:67
 msgid "Tumblr Post Settings"
 msgstr "Tumblr发送设置"
 
-#: ../../addon/tumblr/tumblr.php:69 ../../addon.old/tumblr/tumblr.php:69
+#: ../../addon/tumblr/tumblr.php:188
+msgid "(Re-)Authenticate your tumblr page"
+msgstr ""
+
+#: ../../addon/tumblr/tumblr.php:192 ../../addon.old/tumblr/tumblr.php:69
 msgid "Enable Tumblr Post Plugin"
 msgstr "使Tumblr发送插件能够"
 
-#: ../../addon/tumblr/tumblr.php:74 ../../addon.old/tumblr/tumblr.php:74
-msgid "Tumblr login"
-msgstr "Tumblr登记名"
-
-#: ../../addon/tumblr/tumblr.php:79 ../../addon.old/tumblr/tumblr.php:79
-msgid "Tumblr password"
-msgstr "Tumblr密码"
-
-#: ../../addon/tumblr/tumblr.php:84 ../../addon.old/tumblr/tumblr.php:84
+#: ../../addon/tumblr/tumblr.php:197 ../../addon.old/tumblr/tumblr.php:84
 msgid "Post to Tumblr by default"
 msgstr "默认地给Tumblr发送"
 
+#: ../../addon/tumblr/tumblr.php:217
+msgid "Post to page:"
+msgstr ""
+
+#: ../../addon/tumblr/tumblr.php:228
+msgid "You are not authenticated to tumblr"
+msgstr ""
+
 #: ../../addon/numfriends/numfriends.php:46
 #: ../../addon.old/numfriends/numfriends.php:46
 msgid "Numfriends settings updated."
-msgstr ""
+msgstr "Numfriends设置更新了"
 
 #: ../../addon/numfriends/numfriends.php:77
 #: ../../addon.old/numfriends/numfriends.php:77
 msgid "Numfriends Settings"
-msgstr ""
+msgstr "Numfriends设置"
 
 #: ../../addon/numfriends/numfriends.php:79 ../../addon.old/bg/bg.php:84
 #: ../../addon.old/numfriends/numfriends.php:79
 msgid "How many contacts to display on profile sidebar"
-msgstr ""
+msgstr "多少熟人表示在简介工具栏"
 
 #: ../../addon/gnot/gnot.php:48 ../../addon.old/gnot/gnot.php:48
 msgid "Gnot settings updated."
@@ -7359,22 +7548,22 @@ msgstr ""
 #: ../../addon/showmore/showmore.php:38
 #: ../../addon.old/showmore/showmore.php:38
 msgid "\"Show more\" Settings"
-msgstr ""
+msgstr "「看更多」设置"
 
 #: ../../addon/showmore/showmore.php:41
 #: ../../addon.old/showmore/showmore.php:41
 msgid "Enable Show More"
-msgstr ""
+msgstr "使看更多能用"
 
 #: ../../addon/showmore/showmore.php:44
 #: ../../addon.old/showmore/showmore.php:44
 msgid "Cutting posts after how much characters"
-msgstr ""
+msgstr "剪掉文章多少字后"
 
 #: ../../addon/showmore/showmore.php:65
 #: ../../addon.old/showmore/showmore.php:65
 msgid "Show More Settings saved."
-msgstr ""
+msgstr "看更多设置保存了。"
 
 #: ../../addon/piwik/piwik.php:79 ../../addon.old/piwik/piwik.php:79
 msgid ""
@@ -7398,7 +7587,7 @@ msgstr "Piwik基础URL"
 msgid ""
 "Absolute path to your Piwik installation. (without protocol (http/s), with "
 "trailing slash)"
-msgstr ""
+msgstr "绝对道路到Piwik安装。（没有协议（http/s）跟斜线后缀）"
 
 #: ../../addon/piwik/piwik.php:91 ../../addon.old/piwik/piwik.php:91
 msgid "Site ID"
@@ -7410,27 +7599,27 @@ msgstr " 显示选择性退出cookie按钮？"
 
 #: ../../addon/piwik/piwik.php:93 ../../addon.old/piwik/piwik.php:93
 msgid "Asynchronous tracking"
-msgstr ""
+msgstr "异步追踪"
 
-#: ../../addon/twitter/twitter.php:73 ../../addon.old/twitter/twitter.php:73
+#: ../../addon/twitter/twitter.php:77 ../../addon.old/twitter/twitter.php:73
 msgid "Post to Twitter"
 msgstr "发送到在Twitter"
 
-#: ../../addon/twitter/twitter.php:122 ../../addon.old/twitter/twitter.php:122
+#: ../../addon/twitter/twitter.php:129 ../../addon.old/twitter/twitter.php:122
 msgid "Twitter settings updated."
 msgstr "Twitter设置更新了。"
 
-#: ../../addon/twitter/twitter.php:146 ../../addon.old/twitter/twitter.php:146
+#: ../../addon/twitter/twitter.php:157 ../../addon.old/twitter/twitter.php:146
 msgid "Twitter Posting Settings"
 msgstr "Twitter发送设置"
 
-#: ../../addon/twitter/twitter.php:153 ../../addon.old/twitter/twitter.php:153
+#: ../../addon/twitter/twitter.php:164 ../../addon.old/twitter/twitter.php:153
 msgid ""
 "No consumer key pair for Twitter found. Please contact your site "
 "administrator."
 msgstr "找不到Twitter的消费钥匙双。请联系您的网页行政人员。"
 
-#: ../../addon/twitter/twitter.php:172 ../../addon.old/twitter/twitter.php:172
+#: ../../addon/twitter/twitter.php:183 ../../addon.old/twitter/twitter.php:172
 msgid ""
 "At this Friendica instance the Twitter plugin was enabled but you have not "
 "yet connected your account to your Twitter account. To do so click the "
@@ -7439,22 +7628,22 @@ msgid ""
 " be posted to Twitter."
 msgstr "在这个Friendica网站使Twitter插件可用的可您还没有把您的账户和您Twitter账户连通。为这做点击下边的按钮得到密码从Twitter您要粘贴在下边的输入框和提交。只您的<strong>公开</strong>文章被发送到Twitter。"
 
-#: ../../addon/twitter/twitter.php:173 ../../addon.old/twitter/twitter.php:173
+#: ../../addon/twitter/twitter.php:184 ../../addon.old/twitter/twitter.php:173
 msgid "Log in with Twitter"
 msgstr "用Twitter登记"
 
-#: ../../addon/twitter/twitter.php:175 ../../addon.old/twitter/twitter.php:175
+#: ../../addon/twitter/twitter.php:186 ../../addon.old/twitter/twitter.php:175
 msgid "Copy the PIN from Twitter here"
 msgstr "复制Twitter密码这儿"
 
-#: ../../addon/twitter/twitter.php:190 ../../addon.old/twitter/twitter.php:190
+#: ../../addon/twitter/twitter.php:201 ../../addon.old/twitter/twitter.php:190
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated Twitter account. You can choose to do so by default (here) or for"
 " every posting separately in the posting options when writing the entry."
 msgstr "如果使可用的都您<strong>公开的</strong>文章会被发送到有关的Twitter账户。您会选择默认地这样做（这儿）或个文章分开地写字时候选择在文章设置。"
 
-#: ../../addon/twitter/twitter.php:192 ../../addon.old/twitter/twitter.php:192
+#: ../../addon/twitter/twitter.php:203 ../../addon.old/twitter/twitter.php:192
 msgid ""
 "<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
 "details from unknown viewers?</em>) the link potentially included in public "
@@ -7462,23 +7651,31 @@ msgid ""
 "the visitor that the access to your profile has been restricted."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:195 ../../addon.old/twitter/twitter.php:195
+#: ../../addon/twitter/twitter.php:206 ../../addon.old/twitter/twitter.php:195
 msgid "Allow posting to Twitter"
 msgstr "允许发送到Twitter"
 
-#: ../../addon/twitter/twitter.php:198 ../../addon.old/twitter/twitter.php:198
+#: ../../addon/twitter/twitter.php:209 ../../addon.old/twitter/twitter.php:198
 msgid "Send public postings to Twitter by default"
 msgstr "默认地发送公开文章到Twitter"
 
-#: ../../addon/twitter/twitter.php:201 ../../addon.old/twitter/twitter.php:201
+#: ../../addon/twitter/twitter.php:213
+msgid "Mirror all posts from twitter that are no replies or retweets"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:217
+msgid "Shortening method that optimizes the tweet"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:221 ../../addon.old/twitter/twitter.php:201
 msgid "Send linked #-tags and @-names to Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:396 ../../addon.old/twitter/twitter.php:396
+#: ../../addon/twitter/twitter.php:556 ../../addon.old/twitter/twitter.php:396
 msgid "Consumer key"
 msgstr "钥匙(Consumer key)"
 
-#: ../../addon/twitter/twitter.php:397 ../../addon.old/twitter/twitter.php:397
+#: ../../addon/twitter/twitter.php:557 ../../addon.old/twitter/twitter.php:397
 msgid "Consumer secret"
 msgstr "密码(Consumer secret)"
 
@@ -7617,7 +7814,7 @@ msgid "Color scheme"
 msgstr ""
 
 #: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49
-#: ../../include/nav.php:115
+#: ../../include/nav.php:116
 msgid "Your posts and conversations"
 msgstr "你的消息和交谈"
 
@@ -7646,107 +7843,107 @@ msgid "Your personal photos"
 msgstr "你私人的照片"
 
 #: ../../view/theme/diabook/theme.php:94
-#: ../../view/theme/diabook/theme.php:386
-#: ../../view/theme/diabook/theme.php:635
+#: ../../view/theme/diabook/theme.php:537
+#: ../../view/theme/diabook/theme.php:632
 #: ../../view/theme/diabook/config.php:163
 msgid "Community Pages"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:421
-#: ../../view/theme/diabook/theme.php:637
+#: ../../view/theme/diabook/theme.php:384
+#: ../../view/theme/diabook/theme.php:634
 #: ../../view/theme/diabook/config.php:165
 msgid "Community Profiles"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:442
-#: ../../view/theme/diabook/theme.php:642
+#: ../../view/theme/diabook/theme.php:405
+#: ../../view/theme/diabook/theme.php:639
 #: ../../view/theme/diabook/config.php:170
 msgid "Last users"
 msgstr "上次用户"
 
-#: ../../view/theme/diabook/theme.php:471
-#: ../../view/theme/diabook/theme.php:644
+#: ../../view/theme/diabook/theme.php:434
+#: ../../view/theme/diabook/theme.php:641
 #: ../../view/theme/diabook/config.php:172
 msgid "Last likes"
 msgstr "上次喜欢"
 
-#: ../../view/theme/diabook/theme.php:516
-#: ../../view/theme/diabook/theme.php:643
+#: ../../view/theme/diabook/theme.php:479
+#: ../../view/theme/diabook/theme.php:640
 #: ../../view/theme/diabook/config.php:171
 msgid "Last photos"
 msgstr "上次照片"
 
-#: ../../view/theme/diabook/theme.php:553
-#: ../../view/theme/diabook/theme.php:640
+#: ../../view/theme/diabook/theme.php:516
+#: ../../view/theme/diabook/theme.php:637
 #: ../../view/theme/diabook/config.php:168
 msgid "Find Friends"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:554
+#: ../../view/theme/diabook/theme.php:517
 msgid "Local Directory"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:556 ../../include/contact_widgets.php:35
+#: ../../view/theme/diabook/theme.php:519 ../../include/contact_widgets.php:35
 msgid "Similar Interests"
 msgstr "相似兴趣"
 
-#: ../../view/theme/diabook/theme.php:558 ../../include/contact_widgets.php:37
+#: ../../view/theme/diabook/theme.php:521 ../../include/contact_widgets.php:37
 msgid "Invite Friends"
 msgstr "邀请朋友们"
 
-#: ../../view/theme/diabook/theme.php:575
-#: ../../view/theme/diabook/theme.php:636
+#: ../../view/theme/diabook/theme.php:572
+#: ../../view/theme/diabook/theme.php:633
 #: ../../view/theme/diabook/config.php:164
 msgid "Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:580
+#: ../../view/theme/diabook/theme.php:577
 msgid "Set zoomfactor for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:581
+#: ../../view/theme/diabook/theme.php:578
 #: ../../view/theme/diabook/config.php:161
 msgid "Set longitude (X) for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:582
+#: ../../view/theme/diabook/theme.php:579
 #: ../../view/theme/diabook/config.php:162
 msgid "Set latitude (Y) for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:595
-#: ../../view/theme/diabook/theme.php:638
+#: ../../view/theme/diabook/theme.php:592
+#: ../../view/theme/diabook/theme.php:635
 #: ../../view/theme/diabook/config.php:166
 msgid "Help or @NewHere ?"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:602
-#: ../../view/theme/diabook/theme.php:639
+#: ../../view/theme/diabook/theme.php:599
+#: ../../view/theme/diabook/theme.php:636
 #: ../../view/theme/diabook/config.php:167
 msgid "Connect Services"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:609
-#: ../../view/theme/diabook/theme.php:641
+#: ../../view/theme/diabook/theme.php:606
+#: ../../view/theme/diabook/theme.php:638
 msgid "Last Tweets"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:612
+#: ../../view/theme/diabook/theme.php:609
 #: ../../view/theme/diabook/config.php:159
 msgid "Set twitter search term"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:632
-#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288
+#: ../../view/theme/diabook/theme.php:629
+#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:313
 msgid "don't show"
 msgstr "别著"
 
-#: ../../view/theme/diabook/theme.php:632
-#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287
+#: ../../view/theme/diabook/theme.php:629
+#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:312
 msgid "show"
 msgstr "著"
 
-#: ../../view/theme/diabook/theme.php:633
+#: ../../view/theme/diabook/theme.php:630
 msgid "Show/hide boxes at right-hand column:"
 msgstr ""
 
@@ -7920,6 +8117,10 @@ msgstr "XMPP/IM"
 msgid "MySpace"
 msgstr "MySpace"
 
+#: ../../include/contact_selectors.php:87
+msgid "Google+"
+msgstr ""
+
 #: ../../include/profile_selectors.php:6
 msgid "Male"
 msgstr "男的"
@@ -8064,8 +8265,8 @@ msgstr "外遇"
 msgid "Sex Addict"
 msgstr "性交因成瘾者"
 
-#: ../../include/profile_selectors.php:42 ../../include/user.php:278
-#: ../../include/user.php:282
+#: ../../include/profile_selectors.php:42 ../../include/user.php:279
+#: ../../include/user.php:283
 msgid "Friends"
 msgstr "朋友"
 
@@ -8153,15 +8354,15 @@ msgstr "无所谓"
 msgid "Ask me"
 msgstr "问我"
 
-#: ../../include/event.php:20 ../../include/bb2diaspora.php:396
+#: ../../include/event.php:20 ../../include/bb2diaspora.php:399
 msgid "Starts:"
 msgstr "开始："
 
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:404
+#: ../../include/event.php:30 ../../include/bb2diaspora.php:407
 msgid "Finishes:"
 msgstr "结束："
 
-#: ../../include/delivery.php:457 ../../include/notifier.php:767
+#: ../../include/delivery.php:457 ../../include/notifier.php:771
 msgid "(no subject)"
 msgstr "沒有题目"
 
@@ -8169,241 +8370,241 @@ msgstr "沒有题目"
 msgid " on Last.fm"
 msgstr ""
 
-#: ../../include/text.php:243
+#: ../../include/text.php:262
 msgid "prev"
 msgstr "上个"
 
-#: ../../include/text.php:245
+#: ../../include/text.php:264
 msgid "first"
 msgstr "首先"
 
-#: ../../include/text.php:274
+#: ../../include/text.php:293
 msgid "last"
 msgstr "最后"
 
-#: ../../include/text.php:277
+#: ../../include/text.php:296
 msgid "next"
 msgstr "下个"
 
-#: ../../include/text.php:295
+#: ../../include/text.php:314
 msgid "newer"
 msgstr ""
 
-#: ../../include/text.php:299
+#: ../../include/text.php:318
 msgid "older"
 msgstr ""
 
-#: ../../include/text.php:604
+#: ../../include/text.php:657
 msgid "No contacts"
 msgstr "没有熟人"
 
-#: ../../include/text.php:613
+#: ../../include/text.php:666
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] "%d熟人"
 
-#: ../../include/text.php:726
+#: ../../include/text.php:779
 msgid "poke"
 msgstr ""
 
-#: ../../include/text.php:726 ../../include/conversation.php:210
+#: ../../include/text.php:779 ../../include/conversation.php:210
 msgid "poked"
 msgstr ""
 
-#: ../../include/text.php:727
+#: ../../include/text.php:780
 msgid "ping"
 msgstr ""
 
-#: ../../include/text.php:727
+#: ../../include/text.php:780
 msgid "pinged"
 msgstr ""
 
-#: ../../include/text.php:728
+#: ../../include/text.php:781
 msgid "prod"
 msgstr ""
 
-#: ../../include/text.php:728
+#: ../../include/text.php:781
 msgid "prodded"
 msgstr ""
 
-#: ../../include/text.php:729
+#: ../../include/text.php:782
 msgid "slap"
 msgstr ""
 
-#: ../../include/text.php:729
+#: ../../include/text.php:782
 msgid "slapped"
 msgstr ""
 
-#: ../../include/text.php:730
+#: ../../include/text.php:783
 msgid "finger"
 msgstr ""
 
-#: ../../include/text.php:730
+#: ../../include/text.php:783
 msgid "fingered"
 msgstr ""
 
-#: ../../include/text.php:731
+#: ../../include/text.php:784
 msgid "rebuff"
 msgstr ""
 
-#: ../../include/text.php:731
+#: ../../include/text.php:784
 msgid "rebuffed"
 msgstr ""
 
-#: ../../include/text.php:743
+#: ../../include/text.php:796
 msgid "happy"
 msgstr ""
 
-#: ../../include/text.php:744
+#: ../../include/text.php:797
 msgid "sad"
 msgstr ""
 
-#: ../../include/text.php:745
+#: ../../include/text.php:798
 msgid "mellow"
 msgstr ""
 
-#: ../../include/text.php:746
+#: ../../include/text.php:799
 msgid "tired"
 msgstr ""
 
-#: ../../include/text.php:747
+#: ../../include/text.php:800
 msgid "perky"
 msgstr ""
 
-#: ../../include/text.php:748
+#: ../../include/text.php:801
 msgid "angry"
 msgstr ""
 
-#: ../../include/text.php:749
+#: ../../include/text.php:802
 msgid "stupified"
 msgstr ""
 
-#: ../../include/text.php:750
+#: ../../include/text.php:803
 msgid "puzzled"
 msgstr ""
 
-#: ../../include/text.php:751
+#: ../../include/text.php:804
 msgid "interested"
 msgstr ""
 
-#: ../../include/text.php:752
+#: ../../include/text.php:805
 msgid "bitter"
 msgstr ""
 
-#: ../../include/text.php:753
+#: ../../include/text.php:806
 msgid "cheerful"
 msgstr ""
 
-#: ../../include/text.php:754
+#: ../../include/text.php:807
 msgid "alive"
 msgstr ""
 
-#: ../../include/text.php:755
+#: ../../include/text.php:808
 msgid "annoyed"
 msgstr ""
 
-#: ../../include/text.php:756
+#: ../../include/text.php:809
 msgid "anxious"
 msgstr ""
 
-#: ../../include/text.php:757
+#: ../../include/text.php:810
 msgid "cranky"
 msgstr ""
 
-#: ../../include/text.php:758
+#: ../../include/text.php:811
 msgid "disturbed"
 msgstr ""
 
-#: ../../include/text.php:759
+#: ../../include/text.php:812
 msgid "frustrated"
 msgstr ""
 
-#: ../../include/text.php:760
+#: ../../include/text.php:813
 msgid "motivated"
 msgstr ""
 
-#: ../../include/text.php:761
+#: ../../include/text.php:814
 msgid "relaxed"
 msgstr ""
 
-#: ../../include/text.php:762
+#: ../../include/text.php:815
 msgid "surprised"
 msgstr ""
 
-#: ../../include/text.php:926
+#: ../../include/text.php:979
 msgid "January"
 msgstr "一月"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:979
 msgid "February"
 msgstr "二月"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:979
 msgid "March"
 msgstr "三月"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:979
 msgid "April"
 msgstr "四月"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:979
 msgid "May"
 msgstr "五月"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:979
 msgid "June"
 msgstr "六月"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:979
 msgid "July"
 msgstr "七月"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:979
 msgid "August"
 msgstr "八月"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:979
 msgid "September"
 msgstr "九月"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:979
 msgid "October"
 msgstr "十月"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:979
 msgid "November"
 msgstr "十一月"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:979
 msgid "December"
 msgstr "十二月"
 
-#: ../../include/text.php:1010
+#: ../../include/text.php:1066
 msgid "bytes"
 msgstr "字节"
 
-#: ../../include/text.php:1037 ../../include/text.php:1049
+#: ../../include/text.php:1093 ../../include/text.php:1105
 msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/text.php:1222 ../../include/user.php:236
+#: ../../include/text.php:1278 ../../include/user.php:237
 msgid "default"
 msgstr "默认"
 
-#: ../../include/text.php:1234
+#: ../../include/text.php:1290
 msgid "Select an alternate language"
 msgstr "选择别的语言"
 
-#: ../../include/text.php:1444
+#: ../../include/text.php:1500
 msgid "activity"
 msgstr ""
 
-#: ../../include/text.php:1447
+#: ../../include/text.php:1503
 msgid "post"
 msgstr ""
 
-#: ../../include/text.php:1602
+#: ../../include/text.php:1658
 msgid "Item filed"
 msgstr ""
 
@@ -8411,19 +8612,19 @@ msgstr ""
 msgid "Sharing notification from Diaspora network"
 msgstr "分享通知从Diaspora网络"
 
-#: ../../include/diaspora.php:2236
+#: ../../include/diaspora.php:2239
 msgid "Attachments:"
 msgstr "附件："
 
-#: ../../include/network.php:847
+#: ../../include/network.php:850
 msgid "view full size"
 msgstr "看全尺寸"
 
-#: ../../include/oembed.php:137
+#: ../../include/oembed.php:138
 msgid "Embedded content"
 msgstr "嵌入内容"
 
-#: ../../include/oembed.php:146
+#: ../../include/oembed.php:147
 msgid "Embedding disabled"
 msgstr "嵌入不能用"
 
@@ -8497,7 +8698,7 @@ msgstr "创造新组"
 msgid "Contacts not in any group"
 msgstr ""
 
-#: ../../include/nav.php:46 ../../boot.php:946
+#: ../../include/nav.php:46 ../../boot.php:1007
 msgid "Logout"
 msgstr "注销"
 
@@ -8505,7 +8706,7 @@ msgstr "注销"
 msgid "End this session"
 msgstr "结束这段时间"
 
-#: ../../include/nav.php:49 ../../boot.php:1722
+#: ../../include/nav.php:49 ../../boot.php:1805
 msgid "Status"
 msgstr "现状"
 
@@ -8553,55 +8754,67 @@ msgstr "人物名录"
 msgid "Conversations from your friends"
 msgstr "从你朋友们的交谈"
 
-#: ../../include/nav.php:121
+#: ../../include/nav.php:114
+msgid "Network Reset"
+msgstr ""
+
+#: ../../include/nav.php:114
+msgid "Load Network page with no filters"
+msgstr ""
+
+#: ../../include/nav.php:122
 msgid "Friend Requests"
 msgstr "友谊邀请"
 
-#: ../../include/nav.php:123
+#: ../../include/nav.php:124
 msgid "See all notifications"
 msgstr "看所有的通知"
 
-#: ../../include/nav.php:124
+#: ../../include/nav.php:125
 msgid "Mark all system notifications seen"
 msgstr "记号各系统通知看过的"
 
-#: ../../include/nav.php:128
+#: ../../include/nav.php:129
 msgid "Private mail"
 msgstr "私人的邮件"
 
-#: ../../include/nav.php:129
+#: ../../include/nav.php:130
 msgid "Inbox"
 msgstr "收件箱"
 
-#: ../../include/nav.php:130
+#: ../../include/nav.php:131
 msgid "Outbox"
 msgstr "发件箱"
 
-#: ../../include/nav.php:134
+#: ../../include/nav.php:135
 msgid "Manage"
 msgstr "管理"
 
-#: ../../include/nav.php:134
+#: ../../include/nav.php:135
 msgid "Manage other pages"
 msgstr "管理别的页"
 
-#: ../../include/nav.php:138 ../../boot.php:1236
+#: ../../include/nav.php:138
+msgid "Delegations"
+msgstr ""
+
+#: ../../include/nav.php:142 ../../boot.php:1310
 msgid "Profiles"
 msgstr "简介"
 
-#: ../../include/nav.php:138 ../../boot.php:1236
-msgid "Manage/edit profiles"
-msgstr "管理/修改简介"
+#: ../../include/nav.php:142
+msgid "Manage/Edit Profiles"
+msgstr ""
 
-#: ../../include/nav.php:139
+#: ../../include/nav.php:144
 msgid "Manage/edit friends and contacts"
 msgstr "管理/编朋友们和熟人们"
 
-#: ../../include/nav.php:146
+#: ../../include/nav.php:151
 msgid "Site setup and configuration"
 msgstr "网站开办和配置"
 
-#: ../../include/nav.php:170
+#: ../../include/nav.php:175
 msgid "Nothing new here"
 msgstr "这里没有什么新的"
 
@@ -8643,37 +8856,37 @@ msgstr "比如：李某，打鱼"
 msgid "Random Profile"
 msgstr ""
 
-#: ../../include/contact_widgets.php:68
+#: ../../include/contact_widgets.php:70
 msgid "Networks"
 msgstr "网络"
 
-#: ../../include/contact_widgets.php:71
+#: ../../include/contact_widgets.php:73
 msgid "All Networks"
 msgstr "所有网络"
 
-#: ../../include/contact_widgets.php:98
+#: ../../include/contact_widgets.php:103 ../../include/features.php:59
 msgid "Saved Folders"
 msgstr ""
 
-#: ../../include/contact_widgets.php:101 ../../include/contact_widgets.php:129
+#: ../../include/contact_widgets.php:106 ../../include/contact_widgets.php:138
 msgid "Everything"
 msgstr ""
 
-#: ../../include/contact_widgets.php:126
+#: ../../include/contact_widgets.php:135
 msgid "Categories"
 msgstr ""
 
-#: ../../include/auth.php:36
+#: ../../include/auth.php:38
 msgid "Logged out."
 msgstr "注销了"
 
-#: ../../include/auth.php:126
+#: ../../include/auth.php:128
 msgid ""
 "We encountered a problem while logging in with the OpenID you provided. "
 "Please check the correct spelling of the ID."
 msgstr ""
 
-#: ../../include/auth.php:126
+#: ../../include/auth.php:128
 msgid "The error message was:"
 msgstr ""
 
@@ -8734,32 +8947,183 @@ msgstr "秒"
 msgid "%1$d %2$s ago"
 msgstr "%1$d %2$s以前"
 
-#: ../../include/datetime.php:472 ../../include/items.php:1695
+#: ../../include/datetime.php:472 ../../include/items.php:1705
 #, php-format
 msgid "%s's birthday"
 msgstr ""
 
-#: ../../include/datetime.php:473 ../../include/items.php:1696
+#: ../../include/datetime.php:473 ../../include/items.php:1706
 #, php-format
 msgid "Happy Birthday %s"
 msgstr ""
 
-#: ../../include/onepoll.php:414
-msgid "From: "
-msgstr "从："
-
-#: ../../include/bbcode.php:202 ../../include/bbcode.php:423
+#: ../../include/bbcode.php:210 ../../include/bbcode.php:505
 msgid "Image/photo"
 msgstr "图像／照片"
 
-#: ../../include/bbcode.php:388 ../../include/bbcode.php:408
+#: ../../include/bbcode.php:262
+#, php-format
+msgid ""
+"<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a "
+"href=\"%s\" target=\"external-link\">post</a>:</span>"
+msgstr ""
+
+#: ../../include/bbcode.php:470 ../../include/bbcode.php:490
 msgid "$1 wrote:"
 msgstr "$1写："
 
-#: ../../include/bbcode.php:427 ../../include/bbcode.php:428
+#: ../../include/bbcode.php:510 ../../include/bbcode.php:511
 msgid "Encrypted content"
 msgstr ""
 
+#: ../../include/features.php:23
+msgid "General Features"
+msgstr ""
+
+#: ../../include/features.php:25
+msgid "Multiple Profiles"
+msgstr ""
+
+#: ../../include/features.php:25
+msgid "Ability to create multiple profiles"
+msgstr ""
+
+#: ../../include/features.php:30
+msgid "Post Composition Features"
+msgstr ""
+
+#: ../../include/features.php:31
+msgid "Richtext Editor"
+msgstr ""
+
+#: ../../include/features.php:31
+msgid "Enable richtext editor"
+msgstr ""
+
+#: ../../include/features.php:32
+msgid "Post Preview"
+msgstr ""
+
+#: ../../include/features.php:32
+msgid "Allow previewing posts and comments before publishing them"
+msgstr ""
+
+#: ../../include/features.php:37
+msgid "Network Sidebar Widgets"
+msgstr ""
+
+#: ../../include/features.php:38
+msgid "Search by Date"
+msgstr ""
+
+#: ../../include/features.php:38
+msgid "Ability to select posts by date ranges"
+msgstr ""
+
+#: ../../include/features.php:39
+msgid "Group Filter"
+msgstr ""
+
+#: ../../include/features.php:39
+msgid "Enable widget to display Network posts only from selected group"
+msgstr ""
+
+#: ../../include/features.php:40
+msgid "Network Filter"
+msgstr ""
+
+#: ../../include/features.php:40
+msgid "Enable widget to display Network posts only from selected network"
+msgstr ""
+
+#: ../../include/features.php:41
+msgid "Save search terms for re-use"
+msgstr ""
+
+#: ../../include/features.php:46
+msgid "Network Tabs"
+msgstr ""
+
+#: ../../include/features.php:47
+msgid "Network Personal Tab"
+msgstr ""
+
+#: ../../include/features.php:47
+msgid "Enable tab to display only Network posts that you've interacted on"
+msgstr ""
+
+#: ../../include/features.php:48
+msgid "Network New Tab"
+msgstr ""
+
+#: ../../include/features.php:48
+msgid "Enable tab to display only new Network posts (from the last 12 hours)"
+msgstr ""
+
+#: ../../include/features.php:49
+msgid "Network Shared Links Tab"
+msgstr ""
+
+#: ../../include/features.php:49
+msgid "Enable tab to display only Network posts with links in them"
+msgstr ""
+
+#: ../../include/features.php:54
+msgid "Post/Comment Tools"
+msgstr ""
+
+#: ../../include/features.php:55
+msgid "Multiple Deletion"
+msgstr ""
+
+#: ../../include/features.php:55
+msgid "Select and delete multiple posts/comments at once"
+msgstr ""
+
+#: ../../include/features.php:56
+msgid "Edit Sent Posts"
+msgstr ""
+
+#: ../../include/features.php:56
+msgid "Edit and correct posts and comments after sending"
+msgstr ""
+
+#: ../../include/features.php:57
+msgid "Tagging"
+msgstr ""
+
+#: ../../include/features.php:57
+msgid "Ability to tag existing posts"
+msgstr ""
+
+#: ../../include/features.php:58
+msgid "Post Categories"
+msgstr ""
+
+#: ../../include/features.php:58
+msgid "Add categories to your posts"
+msgstr ""
+
+#: ../../include/features.php:59
+msgid "Ability to file posts under folders"
+msgstr ""
+
+#: ../../include/features.php:60
+msgid "Dislike Posts"
+msgstr ""
+
+#: ../../include/features.php:60
+msgid "Ability to dislike posts/comments"
+msgstr ""
+
+#: ../../include/features.php:61
+msgid "Star Posts"
+msgstr ""
+
+#: ../../include/features.php:61
+msgid "Ability to mark special posts with a star indicator"
+msgstr ""
+
 #: ../../include/dba.php:41
 #, php-format
 msgid "Cannot locate DNS info for database server '%s'"
@@ -8769,7 +9133,7 @@ msgstr "找不到DNS信息为数据库服务器「%s」"
 msgid "[no subject]"
 msgstr "[无题目]"
 
-#: ../../include/acl_selectors.php:286
+#: ../../include/acl_selectors.php:311
 msgid "Visible to everybody"
 msgstr "任何人可见的"
 
@@ -9014,83 +9378,83 @@ msgstr "不能取回熟人消息。"
 msgid "following"
 msgstr "关注"
 
-#: ../../include/items.php:3363
+#: ../../include/items.php:3373
 msgid "A new person is sharing with you at "
 msgstr "一位新人给你分享在"
 
-#: ../../include/items.php:3363
+#: ../../include/items.php:3373
 msgid "You have a new follower at "
 msgstr "你有新的关注者在"
 
-#: ../../include/items.php:4044
+#: ../../include/items.php:4057
 msgid "Archives"
 msgstr ""
 
-#: ../../include/user.php:38
+#: ../../include/user.php:39
 msgid "An invitation is required."
 msgstr "邀请必要的。"
 
-#: ../../include/user.php:43
+#: ../../include/user.php:44
 msgid "Invitation could not be verified."
 msgstr "不能证实邀请。"
 
-#: ../../include/user.php:51
+#: ../../include/user.php:52
 msgid "Invalid OpenID url"
 msgstr "无效的OpenID url"
 
-#: ../../include/user.php:66
+#: ../../include/user.php:67
 msgid "Please enter the required information."
 msgstr "请输入必要的信息。"
 
-#: ../../include/user.php:80
+#: ../../include/user.php:81
 msgid "Please use a shorter name."
 msgstr "请用短一点名。"
 
-#: ../../include/user.php:82
+#: ../../include/user.php:83
 msgid "Name too short."
 msgstr "名字太短。"
 
-#: ../../include/user.php:97
+#: ../../include/user.php:98
 msgid "That doesn't appear to be your full (First Last) name."
 msgstr "这看上去不是您的全姓名。"
 
-#: ../../include/user.php:102
+#: ../../include/user.php:103
 msgid "Your email domain is not among those allowed on this site."
 msgstr "这网站允许的域名中没有您的"
 
-#: ../../include/user.php:105
+#: ../../include/user.php:106
 msgid "Not a valid email address."
 msgstr "无效的邮件地址。"
 
-#: ../../include/user.php:115
+#: ../../include/user.php:116
 msgid "Cannot use that email."
 msgstr "不能用这个邮件地址。"
 
-#: ../../include/user.php:121
+#: ../../include/user.php:122
 msgid ""
 "Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
 "must also begin with a letter."
 msgstr "您的昵称只能包括\"a-z\",\"0-9\",\"-\"和\"_\",还有头一字必须是拉丁字。"
 
-#: ../../include/user.php:127 ../../include/user.php:225
+#: ../../include/user.php:128 ../../include/user.php:226
 msgid "Nickname is already registered. Please choose another."
 msgstr "昵称已经报到。请选择新的。"
 
-#: ../../include/user.php:137
+#: ../../include/user.php:138
 msgid ""
 "Nickname was once registered here and may not be re-used. Please choose "
 "another."
 msgstr ""
 
-#: ../../include/user.php:153
+#: ../../include/user.php:154
 msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr "要紧错误：产生安全钥匙失败了。"
 
-#: ../../include/user.php:211
+#: ../../include/user.php:212
 msgid "An error occurred during registration. Please try again."
 msgstr "报到出了问题。请再试。"
 
-#: ../../include/user.php:246
+#: ../../include/user.php:247
 msgid "An error occurred creating your default profile. Please try again."
 msgstr "造成默认简介出了问题。请再试。"
 
@@ -9116,34 +9480,34 @@ msgstr ""
 msgid "stopped following"
 msgstr "结束关注了"
 
-#: ../../include/Contact.php:225 ../../include/conversation.php:795
+#: ../../include/Contact.php:225 ../../include/conversation.php:816
 msgid "Poke"
 msgstr ""
 
-#: ../../include/Contact.php:226 ../../include/conversation.php:789
+#: ../../include/Contact.php:226 ../../include/conversation.php:810
 msgid "View Status"
 msgstr ""
 
-#: ../../include/Contact.php:227 ../../include/conversation.php:790
+#: ../../include/Contact.php:227 ../../include/conversation.php:811
 msgid "View Profile"
 msgstr ""
 
-#: ../../include/Contact.php:228 ../../include/conversation.php:791
+#: ../../include/Contact.php:228 ../../include/conversation.php:812
 msgid "View Photos"
 msgstr ""
 
 #: ../../include/Contact.php:229 ../../include/Contact.php:242
-#: ../../include/conversation.php:792
+#: ../../include/conversation.php:813
 msgid "Network Posts"
 msgstr ""
 
 #: ../../include/Contact.php:230 ../../include/Contact.php:242
-#: ../../include/conversation.php:793
+#: ../../include/conversation.php:814
 msgid "Edit Contact"
 msgstr ""
 
 #: ../../include/Contact.php:231 ../../include/Contact.php:242
-#: ../../include/conversation.php:794
+#: ../../include/conversation.php:815
 msgid "Send PM"
 msgstr "法私人的新闻"
 
@@ -9154,97 +9518,99 @@ msgstr ""
 
 #: ../../include/conversation.php:290
 msgid "post/item"
-msgstr ""
+msgstr "文章／项目"
 
 #: ../../include/conversation.php:291
 #, php-format
 msgid "%1$s marked %2$s's %3$s as favorite"
-msgstr ""
+msgstr "%1$s标注%2$s的%3$s为偏爱"
 
-#: ../../include/conversation.php:599 ../../object/Item.php:220
+#: ../../include/conversation.php:620 ../../object/Item.php:248
 msgid "Categories:"
 msgstr ""
 
-#: ../../include/conversation.php:600 ../../object/Item.php:221
+#: ../../include/conversation.php:621 ../../object/Item.php:249
 msgid "Filed under:"
 msgstr ""
 
-#: ../../include/conversation.php:685
+#: ../../include/conversation.php:706
 msgid "remove"
 msgstr ""
 
-#: ../../include/conversation.php:689
+#: ../../include/conversation.php:710
 msgid "Delete Selected Items"
 msgstr "删除选的项目"
 
-#: ../../include/conversation.php:788
+#: ../../include/conversation.php:809
 msgid "Follow Thread"
 msgstr ""
 
-#: ../../include/conversation.php:857
+#: ../../include/conversation.php:878
 #, php-format
 msgid "%s likes this."
 msgstr "%s喜欢这个."
 
-#: ../../include/conversation.php:857
+#: ../../include/conversation.php:878
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s没有喜欢这个."
 
-#: ../../include/conversation.php:861
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this."
-msgstr "<span  %1$s>%2$d人</span>喜欢这个。"
+#: ../../include/conversation.php:884
+msgid "like this"
+msgstr ""
 
-#: ../../include/conversation.php:863
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this."
-msgstr "<span  %1$s>%2$d人</span>不喜欢这个。"
+#: ../../include/conversation.php:888
+msgid "don't like this"
+msgstr ""
 
-#: ../../include/conversation.php:869
+#: ../../include/conversation.php:895
+msgid "people"
+msgstr ""
+
+#: ../../include/conversation.php:905
 msgid "and"
 msgstr "和"
 
-#: ../../include/conversation.php:875
+#: ../../include/conversation.php:911
 #, php-format
 msgid ", and %d other people"
 msgstr "，和%d别人"
 
-#: ../../include/conversation.php:877
+#: ../../include/conversation.php:913
 #, php-format
 msgid "%s like this."
 msgstr "%s喜欢这个"
 
-#: ../../include/conversation.php:877
+#: ../../include/conversation.php:913
 #, php-format
 msgid "%s don't like this."
 msgstr "%s不喜欢这个"
 
-#: ../../include/conversation.php:901 ../../include/conversation.php:919
+#: ../../include/conversation.php:940 ../../include/conversation.php:958
 msgid "Visible to <strong>everybody</strong>"
 msgstr "<strong>大家</strong>可见的"
 
-#: ../../include/conversation.php:903 ../../include/conversation.php:921
+#: ../../include/conversation.php:942 ../../include/conversation.php:960
 msgid "Please enter a video link/URL:"
 msgstr "请输入视频连接／URL："
 
-#: ../../include/conversation.php:904 ../../include/conversation.php:922
+#: ../../include/conversation.php:943 ../../include/conversation.php:961
 msgid "Please enter an audio link/URL:"
 msgstr "请输入音响连接／URL："
 
-#: ../../include/conversation.php:905 ../../include/conversation.php:923
+#: ../../include/conversation.php:944 ../../include/conversation.php:962
 msgid "Tag term:"
 msgstr "标签:"
 
-#: ../../include/conversation.php:907 ../../include/conversation.php:925
+#: ../../include/conversation.php:946 ../../include/conversation.php:964
 msgid "Where are you right now?"
 msgstr "你在哪里?"
 
-#: ../../include/conversation.php:908
+#: ../../include/conversation.php:947
 msgid "Delete item(s)?"
 msgstr ""
 
-#: ../../include/conversation.php:987
+#: ../../include/conversation.php:1026
 msgid "permissions"
 msgstr "权利"
 
@@ -9260,113 +9626,133 @@ msgstr ""
 msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../boot.php:605
+#: ../../boot.php:640
 msgid "Delete this item?"
 msgstr "删除这个项目？"
 
-#: ../../boot.php:608
+#: ../../boot.php:643
 msgid "show fewer"
 msgstr "显示更小"
 
-#: ../../boot.php:817
+#: ../../boot.php:878
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:819
+#: ../../boot.php:880
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:920
+#: ../../boot.php:982
 msgid "Create a New Account"
 msgstr "创造新的账户"
 
-#: ../../boot.php:949
+#: ../../boot.php:1010
 msgid "Nickname or Email address: "
 msgstr "绰号或电子邮件地址: "
 
-#: ../../boot.php:950
+#: ../../boot.php:1011
 msgid "Password: "
 msgstr "密码: "
 
-#: ../../boot.php:951
+#: ../../boot.php:1012
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:954
+#: ../../boot.php:1015
 msgid "Or login using OpenID: "
-msgstr ""
+msgstr "或者用OpenID登记："
 
-#: ../../boot.php:960
+#: ../../boot.php:1021
 msgid "Forgot your password?"
 msgstr "忘记你的密码吗？"
 
-#: ../../boot.php:1085
+#: ../../boot.php:1024
+msgid "Website Terms of Service"
+msgstr ""
+
+#: ../../boot.php:1025
+msgid "terms of service"
+msgstr ""
+
+#: ../../boot.php:1027
+msgid "Website Privacy Policy"
+msgstr ""
+
+#: ../../boot.php:1028
+msgid "privacy policy"
+msgstr ""
+
+#: ../../boot.php:1157
 msgid "Requested account is not available."
 msgstr ""
 
-#: ../../boot.php:1162
+#: ../../boot.php:1236
 msgid "Edit profile"
 msgstr "修改简介"
 
-#: ../../boot.php:1228
+#: ../../boot.php:1302
 msgid "Message"
 msgstr ""
 
-#: ../../boot.php:1350 ../../boot.php:1436
+#: ../../boot.php:1310
+msgid "Manage/edit profiles"
+msgstr "管理/修改简介"
+
+#: ../../boot.php:1433 ../../boot.php:1519
 msgid "g A l F d"
 msgstr "g A l d F"
 
-#: ../../boot.php:1351 ../../boot.php:1437
+#: ../../boot.php:1434 ../../boot.php:1520
 msgid "F d"
 msgstr "F d"
 
-#: ../../boot.php:1396 ../../boot.php:1477
+#: ../../boot.php:1479 ../../boot.php:1560
 msgid "[today]"
 msgstr "[今天]"
 
-#: ../../boot.php:1408
+#: ../../boot.php:1491
 msgid "Birthday Reminders"
 msgstr "提醒生日"
 
-#: ../../boot.php:1409
+#: ../../boot.php:1492
 msgid "Birthdays this week:"
 msgstr "这周的生日:"
 
-#: ../../boot.php:1470
+#: ../../boot.php:1553
 msgid "[No description]"
 msgstr "[无描述]"
 
-#: ../../boot.php:1488
+#: ../../boot.php:1571
 msgid "Event Reminders"
 msgstr "事件提醒"
 
-#: ../../boot.php:1489
+#: ../../boot.php:1572
 msgid "Events this week:"
 msgstr "这周的事件:"
 
-#: ../../boot.php:1725
+#: ../../boot.php:1808
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../boot.php:1732
+#: ../../boot.php:1815
 msgid "Profile Details"
 msgstr ""
 
-#: ../../boot.php:1749
+#: ../../boot.php:1832
 msgid "Events and Calendar"
 msgstr ""
 
-#: ../../boot.php:1756
+#: ../../boot.php:1839
 msgid "Only You Can See This"
 msgstr ""
 
-#: ../../object/Item.php:232
+#: ../../object/Item.php:260
 msgid "via"
 msgstr ""
 
-#: ../../index.php:398
+#: ../../index.php:392
 msgid "toggle mobile"
 msgstr ""
 
@@ -9380,39 +9766,39 @@ msgstr ""
 
 #: ../../addon.old/drpost/drpost.php:35
 msgid "Post to Drupal"
-msgstr ""
+msgstr "发到Drupal"
 
 #: ../../addon.old/drpost/drpost.php:72
 msgid "Drupal Post Settings"
-msgstr ""
+msgstr "Drupal设置"
 
 #: ../../addon.old/drpost/drpost.php:74
 msgid "Enable Drupal Post Plugin"
-msgstr ""
+msgstr "使Drupal插件能够"
 
 #: ../../addon.old/drpost/drpost.php:79
 msgid "Drupal username"
-msgstr ""
+msgstr "Drupal用户名"
 
 #: ../../addon.old/drpost/drpost.php:84
 msgid "Drupal password"
-msgstr ""
+msgstr "Drupal密码"
 
 #: ../../addon.old/drpost/drpost.php:89
 msgid "Post Type - article,page,or blog"
-msgstr ""
+msgstr "文章种类－文章，页，博客"
 
 #: ../../addon.old/drpost/drpost.php:94
 msgid "Drupal site URL"
-msgstr ""
+msgstr "Drupal网站URL"
 
 #: ../../addon.old/drpost/drpost.php:99
 msgid "Drupal site uses clean URLS"
-msgstr ""
+msgstr "Drupal网站用整洁URL"
 
 #: ../../addon.old/drpost/drpost.php:104
 msgid "Post to Drupal by default"
-msgstr ""
+msgstr "默认地发到Drupal"
 
 #: ../../addon.old/oembed.old/oembed.php:30
 msgid "OEmbed settings updated"
@@ -9425,3 +9811,11 @@ msgstr "用OEmbed为YouTube视频"
 #: ../../addon.old/oembed.old/oembed.php:71
 msgid "URL to embed:"
 msgstr "URL要嵌入："
+
+#: ../../addon.old/tumblr/tumblr.php:74
+msgid "Tumblr login"
+msgstr "Tumblr登记名"
+
+#: ../../addon.old/tumblr/tumblr.php:79
+msgid "Tumblr password"
+msgstr "Tumblr密码"
diff --git a/view/zh-cn/smarty3/follow_notify_eml.tpl b/view/zh-cn/smarty3/follow_notify_eml.tpl
index 2e1bb691ab..9b711167f0 100644
--- a/view/zh-cn/smarty3/follow_notify_eml.tpl
+++ b/view/zh-cn/smarty3/follow_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 尊敬的{{$myname}},
 
diff --git a/view/zh-cn/smarty3/friend_complete_eml.tpl b/view/zh-cn/smarty3/friend_complete_eml.tpl
index d5f9b8c86a..15c64916ec 100644
--- a/view/zh-cn/smarty3/friend_complete_eml.tpl
+++ b/view/zh-cn/smarty3/friend_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 尊敬的{{$username}},
 
diff --git a/view/zh-cn/smarty3/intro_complete_eml.tpl b/view/zh-cn/smarty3/intro_complete_eml.tpl
index a7a510af63..73c7b0e357 100644
--- a/view/zh-cn/smarty3/intro_complete_eml.tpl
+++ b/view/zh-cn/smarty3/intro_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 尊敬的{{$username}},
 
diff --git a/view/zh-cn/smarty3/lostpass_eml.tpl b/view/zh-cn/smarty3/lostpass_eml.tpl
index 07e6c10cff..c6cbd4bb10 100644
--- a/view/zh-cn/smarty3/lostpass_eml.tpl
+++ b/view/zh-cn/smarty3/lostpass_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 尊敬的{{$username}}，
 	{{$sitename}}最近收到一个要求复位您的账户 
diff --git a/view/zh-cn/smarty3/passchanged_eml.tpl b/view/zh-cn/smarty3/passchanged_eml.tpl
index 517083073d..ef0b811f8b 100644
--- a/view/zh-cn/smarty3/passchanged_eml.tpl
+++ b/view/zh-cn/smarty3/passchanged_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 尊敬的{{$username}}。
 	您的随您要求密码变化了。请保持这 
diff --git a/view/zh-cn/smarty3/register_open_eml.tpl b/view/zh-cn/smarty3/register_open_eml.tpl
index 2d8f780429..8cc6b591d6 100644
--- a/view/zh-cn/smarty3/register_open_eml.tpl
+++ b/view/zh-cn/smarty3/register_open_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 尊敬的{{$username}}，
 	谢谢注册在{{$sitename}}。您的账户造成了。 
diff --git a/view/zh-cn/smarty3/register_verify_eml.tpl b/view/zh-cn/smarty3/register_verify_eml.tpl
index c2401e2d95..3758f5c964 100644
--- a/view/zh-cn/smarty3/register_verify_eml.tpl
+++ b/view/zh-cn/smarty3/register_verify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 受到新的用户注册要求在{{$sitename}}，要 
 您的批准。 
diff --git a/view/zh-cn/smarty3/request_notify_eml.tpl b/view/zh-cn/smarty3/request_notify_eml.tpl
index e8597049bb..90eb7e4f61 100644
--- a/view/zh-cn/smarty3/request_notify_eml.tpl
+++ b/view/zh-cn/smarty3/request_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 尊敬的{{$myname}}，
 
diff --git a/view/zh-cn/smarty3/update_fail_eml.tpl b/view/zh-cn/smarty3/update_fail_eml.tpl
index ebc9a09dbc..e747a4e4d5 100644
--- a/view/zh-cn/smarty3/update_fail_eml.tpl
+++ b/view/zh-cn/smarty3/update_fail_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Hey, 
 I'm {{$sitename}}.   
 The friendica developers released update {{$update}} recently, 
diff --git a/view/zh-cn/strings.php b/view/zh-cn/strings.php
index 4e0cc5a00f..229c8e4c43 100644
--- a/view/zh-cn/strings.php
+++ b/view/zh-cn/strings.php
@@ -13,7 +13,7 @@ $a->strings["Contact not found."] = "没找到熟人。";
 $a->strings["Repair Contact Settings"] = "维修熟人设置";
 $a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>注意：这是很高等的</strong>，你输入错的信息你和熟人的沟通会弄失灵了。";
 $a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "请<strong>立即</strong>用后退按钮如果您不确定怎么用这页";
-$a->strings["Return to contact editor"] = "";
+$a->strings["Return to contact editor"] = "回归熟人处理器";
 $a->strings["Name"] = "名字";
 $a->strings["Account Nickname"] = "帐户昵称";
 $a->strings["@Tagname - overrides Name/Nickname"] = "@Tagname越过名／昵称";
@@ -84,7 +84,6 @@ $a->strings["Public access denied."] = "公众看拒绝";
 $a->strings["No photos selected"] = "没有照片挑选了";
 $a->strings["Access to this item is restricted."] = "这个项目使用权限的。";
 $a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "";
-$a->strings["You have used %1$.2f Mbytes of photo storage."] = "";
 $a->strings["Upload Photos"] = "上传照片";
 $a->strings["New album name: "] = "新册名：";
 $a->strings["or existing album name: "] = "或现有册名";
@@ -257,6 +256,11 @@ $a->strings["This is most often a permission setting, as the web server may not
 $a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder."] = "";
 $a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "";
 $a->strings[".htconfig.php is writable"] = ".htconfig.php是可写的";
+$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "";
+$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "";
+$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "";
+$a->strings["Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains."] = "";
+$a->strings["view/smarty3 is writable"] = "";
 $a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "";
 $a->strings["Url rewrite is working"] = "";
 $a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "数据库设置文件「.htconfig.php」不能被写。请把包括的正文造成设置文件在网服务器子目录。";
@@ -333,8 +337,8 @@ $a->strings["Notification type: "] = "通知种类：";
 $a->strings["Friend Suggestion"] = "朋友建议";
 $a->strings["suggested by %s"] = "由%s建议的";
 $a->strings["Hide this contact from others"] = "隐藏这个熟人给别人";
-$a->strings["Post a new friend activity"] = "";
-$a->strings["if applicable"] = "";
+$a->strings["Post a new friend activity"] = "表新朋友活动";
+$a->strings["if applicable"] = "或适用";
 $a->strings["Approve"] = "批准";
 $a->strings["Claims to be known to you: "] = "声称被您认识：";
 $a->strings["yes"] = "是";
@@ -353,13 +357,13 @@ $a->strings["%s is now friends with %s"] = "%s成为%s的朋友";
 $a->strings["%s created a new post"] = "%s造成新文章";
 $a->strings["%s commented on %s's post"] = "%s便条%s的文章";
 $a->strings["No more network notifications."] = "没有别的网络通信。";
-$a->strings["Network Notifications"] = "";
-$a->strings["No more system notifications."] = "";
-$a->strings["System Notifications"] = "";
+$a->strings["Network Notifications"] = "网络通知";
+$a->strings["No more system notifications."] = "没别系统通知。";
+$a->strings["System Notifications"] = "系统通知";
 $a->strings["No more personal notifications."] = "没有别的私人通信。";
-$a->strings["Personal Notifications"] = "";
+$a->strings["Personal Notifications"] = "私人通知";
 $a->strings["No more home notifications."] = "没有别的家通信。";
-$a->strings["Home Notifications"] = "";
+$a->strings["Home Notifications"] = "主页通知";
 $a->strings["Could not access contact record."] = "用不了熟人记录。";
 $a->strings["Could not locate selected profile."] = "找不到选择的简介。";
 $a->strings["Contact updated."] = "熟人更新了。";
@@ -385,7 +389,7 @@ $a->strings["%d contact in common"] = array(
 $a->strings["View all contacts"] = "看所有的熟人";
 $a->strings["Unblock"] = "不拦";
 $a->strings["Block"] = "拦";
-$a->strings["Toggle Blocked status"] = "";
+$a->strings["Toggle Blocked status"] = "交替拦配置";
 $a->strings["Unignore"] = "停不理";
 $a->strings["Toggle Ignored status"] = "";
 $a->strings["Unarchive"] = "";
@@ -437,7 +441,6 @@ $a->strings["Find"] = "搜索";
 $a->strings["No valid account found."] = "找不到效的账户。";
 $a->strings["Password reset request issued. Check your email."] = "重设密码要求发布了。核对您的收件箱。";
 $a->strings["Password reset requested at %s"] = "重设密码要求被发布%s";
-$a->strings["Administrator"] = "管理员";
 $a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "要求确认不了。(您可能已经提交它。)重设密码失败了。";
 $a->strings["Password Reset"] = "复位密码";
 $a->strings["Your password has been reset as requested."] = "您的密码被重设如要求的。";
@@ -445,14 +448,17 @@ $a->strings["Your new password is"] = "你的新的密码是";
 $a->strings["Save or copy your new password - and then"] = "保存或复制新密码－之后";
 $a->strings["click here to login"] = "在这儿点击";
 $a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "您的密码能被变化从<em>设置</em>页成功登记后。";
+$a->strings["Your password has been changed at %s"] = "";
 $a->strings["Forgot your Password?"] = "忘记你的密码吗？";
 $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "输入您的邮件地址和提交为重置密码。然后核对收件箱看别的说明。";
 $a->strings["Nickname or Email: "] = "昵称或邮件地址：";
 $a->strings["Reset"] = "复位";
+$a->strings["Additional features"] = "";
 $a->strings["Missing some important data!"] = "有的重要信息失踪的！";
 $a->strings["Update"] = "更新";
 $a->strings["Failed to connect with email account using the settings provided."] = "不能连接电子邮件账户用输入的设置。";
 $a->strings["Email settings updated."] = "电子邮件设置更新了";
+$a->strings["Features updated"] = "";
 $a->strings["Passwords do not match. Password unchanged."] = "密码们不相配。密码没未改变的。";
 $a->strings["Empty passwords are not allowed. Password unchanged."] = "空的密码禁止。密码没未改变的。";
 $a->strings["Password changed."] = "密码变化了。";
@@ -476,6 +482,9 @@ $a->strings["No name"] = "无名";
 $a->strings["Remove authorization"] = "撤消权能";
 $a->strings["No Plugin settings configured"] = "没插件设置配置了";
 $a->strings["Plugin Settings"] = "插件设置";
+$a->strings["Off"] = "";
+$a->strings["On"] = "";
+$a->strings["Additional Features"] = "";
 $a->strings["Built-in support for %s connectivity is %s"] = "包括的支持为%s连通性是%s";
 $a->strings["enabled"] = "能够做的";
 $a->strings["disabled"] = "使不能用";
@@ -529,7 +538,7 @@ $a->strings["Permit unknown people to send you private mail?"] = "";
 $a->strings["Profile is <strong>not published</strong>."] = "简介是<strong>没出版</strong>";
 $a->strings["or"] = "或者";
 $a->strings["Your Identity Address is"] = "您的同一个人地址是";
-$a->strings["Automatically expire posts after this many days:"] = "";
+$a->strings["Automatically expire posts after this many days:"] = "自动地过期文章这数天：";
 $a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "如果空的，文章不会过期。过期的文章被删除";
 $a->strings["Advanced expiration settings"] = "先进的过期设置";
 $a->strings["Advanced Expiration"] = "先进的过期";
@@ -572,7 +581,7 @@ $a->strings["You are poked/prodded/etc. in a post"] = "";
 $a->strings["Advanced Account/Page Type Settings"] = "";
 $a->strings["Change the behaviour of this account for special situations"] = "";
 $a->strings["Manage Identities and/or Pages"] = "管理身份或页";
-$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "";
+$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "交替不同同一人或社会／组页合用您的账户或给您「管理」批准";
 $a->strings["Select an identity to manage: "] = "选择同一个人管理：";
 $a->strings["Search Results For:"] = "搜索结果为：";
 $a->strings["Remove term"] = "删除关键字";
@@ -585,10 +594,10 @@ $a->strings["Sort by Post Date"] = "";
 $a->strings["Posts that mention or involve you"] = "";
 $a->strings["New"] = "新";
 $a->strings["Activity Stream - by date"] = "";
-$a->strings["Starred"] = "被星";
-$a->strings["Favourite Posts"] = "";
 $a->strings["Shared Links"] = "";
 $a->strings["Interesting Links"] = "";
+$a->strings["Starred"] = "被星";
+$a->strings["Favourite Posts"] = "";
 $a->strings["Warning: This group contains %s member from an insecure network."] = array(
 	0 => "警告：这个组包括%s成员从不安全网络。",
 );
@@ -601,7 +610,9 @@ $a->strings["Save"] = "保存";
 $a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "这个网站超过一天最多账户注册。请明天再试。";
 $a->strings["Import"] = "";
 $a->strings["Move account"] = "";
-$a->strings["You can import an account from another Friendica server. <br>\r\n                            You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here.<br>\r\n                            <b>This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from diaspora"] = "";
+$a->strings["You can import an account from another Friendica server."] = "";
+$a->strings["You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."] = "";
+$a->strings["This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from Diaspora"] = "";
 $a->strings["Account file"] = "";
 $a->strings["To export your accont, go to \"Settings->Export your porsonal data\" and select \"Export account\""] = "";
 $a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "";
@@ -644,7 +655,7 @@ $a->strings["Your Contacts page is your gateway to managing friendships and conn
 $a->strings["Go to Your Site's Directory"] = "";
 $a->strings["The Directory page lets you find other people in this network or other federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on their profile page. Provide your own Identity Address if requested."] = "目录页让您找别人在这个网络或别的同盟的网站。找一个<em>连接</em>或<em>关注</em>按钮在他们的简介页。您被要求的话，提供您自己的同一个人地址。";
 $a->strings["Finding New People"] = "";
-$a->strings["On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours."] = "";
+$a->strings["On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours."] = "在熟人页的工具栏有一些工具为找新朋友们。我们会使人们相配按名或兴趣，和以网络关系作为提醒建议的根据。在新网站，朋友建议平常开始24小时后。";
 $a->strings["Groups"] = "组";
 $a->strings["Group Your Contacts"] = "";
 $a->strings["Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page."] = "您交朋友们后，组织他们分私人交流组在您熟人页的边栏，您会私下地跟组交流在您的网络页。";
@@ -755,7 +766,7 @@ $a->strings["Theme settings updated."] = "";
 $a->strings["Site"] = "网站";
 $a->strings["Users"] = "用户";
 $a->strings["Plugins"] = "插件";
-$a->strings["Themes"] = "";
+$a->strings["Themes"] = "主题";
 $a->strings["DB updates"] = "";
 $a->strings["Logs"] = "记录";
 $a->strings["Admin"] = "管理";
@@ -784,6 +795,7 @@ $a->strings["Self-signed certificate, use SSL for local links only (discouraged)
 $a->strings["File upload"] = "文件上传";
 $a->strings["Policies"] = "政策";
 $a->strings["Advanced"] = "高等";
+$a->strings["Performance"] = "";
 $a->strings["Site name"] = "网页名字";
 $a->strings["Banner/Logo"] = "标题/标志";
 $a->strings["System language"] = "系统语言";
@@ -793,6 +805,8 @@ $a->strings["Mobile system theme"] = "";
 $a->strings["Theme for mobile devices"] = "";
 $a->strings["SSL link policy"] = "";
 $a->strings["Determines whether generated links should be forced to use SSL"] = "";
+$a->strings["'Share' element"] = "";
+$a->strings["Activates the bbcode element 'share' for repeating items."] = "";
 $a->strings["Maximum image size"] = "图片最大尺寸";
 $a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "";
 $a->strings["Maximum image length"] = "";
@@ -800,6 +814,8 @@ $a->strings["Maximum length in pixels of the longest side of uploaded images. De
 $a->strings["JPEG image quality"] = "";
 $a->strings["Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality."] = "";
 $a->strings["Register policy"] = "注册政策";
+$a->strings["Maximum Daily Registrations"] = "";
+$a->strings["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."] = "";
 $a->strings["Register text"] = "注册正文";
 $a->strings["Will be displayed prominently on the registration page."] = "";
 $a->strings["Accounts abandoned after x days"] = "账户丢弃X天后";
@@ -846,6 +862,14 @@ $a->strings["Poll interval"] = "";
 $a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "";
 $a->strings["Maximum Load Average"] = "";
 $a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "";
+$a->strings["Use MySQL full text engine"] = "";
+$a->strings["Activates the full text engine. Speeds up search - but can only search for four and more characters."] = "";
+$a->strings["Path to item cache"] = "";
+$a->strings["Cache duration in seconds"] = "";
+$a->strings["How long should the cache files be hold? Default value is 86400 seconds (One day)."] = "";
+$a->strings["Path for lock file"] = "";
+$a->strings["Temp path"] = "";
+$a->strings["Base path to installation"] = "";
 $a->strings["Update has been marked successful"] = "";
 $a->strings["Executing %s failed. Check system logs."] = "";
 $a->strings["Update %s was successfully applied."] = "";
@@ -885,7 +909,7 @@ $a->strings["Enable"] = "使能用";
 $a->strings["Toggle"] = "肘节";
 $a->strings["Author: "] = "";
 $a->strings["Maintainer: "] = "";
-$a->strings["No themes found."] = "";
+$a->strings["No themes found."] = "找不到主题。";
 $a->strings["Screenshot"] = "";
 $a->strings["[Experimental]"] = "";
 $a->strings["[Unsupported]"] = "";
@@ -927,6 +951,10 @@ $a->strings["Applications"] = "应用";
 $a->strings["No installed applications."] = "没有安装的应用";
 $a->strings["Search"] = "搜索";
 $a->strings["Profile not found."] = "找不到简介。";
+$a->strings["Profile deleted."] = "简介删除了。";
+$a->strings["Profile-"] = "简介-";
+$a->strings["New profile created."] = "创造新的简介";
+$a->strings["Profile unavailable to clone."] = "简介不可用为复制。";
 $a->strings["Profile Name is required."] = "必要简介名";
 $a->strings["Marital Status"] = "";
 $a->strings["Romantic Partner"] = "";
@@ -947,12 +975,9 @@ $a->strings["public profile"] = "";
 $a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "";
 $a->strings[" - Visit %1\$s's %2\$s"] = "";
 $a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "";
-$a->strings["Profile deleted."] = "简介删除了。";
-$a->strings["Profile-"] = "简介-";
-$a->strings["New profile created."] = "创造新的简介";
-$a->strings["Profile unavailable to clone."] = "简介不可用为复制。";
 $a->strings["Hide your contact/friend list from viewers of this profile?"] = "藏起来发现您的熟人／朋友单不让这个简介看着看？";
 $a->strings["Edit Profile Details"] = "剪辑简介消息";
+$a->strings["Change Profile Photo"] = "";
 $a->strings["View this profile"] = "看这个简介";
 $a->strings["Create a new profile using these settings"] = "造成新的简介用这些设置";
 $a->strings["Clone this profile"] = "复制这个简介";
@@ -1004,12 +1029,12 @@ $a->strings["Edit visibility"] = "修改能见度";
 $a->strings["Save to Folder:"] = "";
 $a->strings["- select -"] = "";
 $a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s把%4\$s标签%2\$s的%3\$s";
-$a->strings["No potential page delegates located."] = "";
-$a->strings["Delegate Page Management"] = "";
-$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "";
-$a->strings["Existing Page Managers"] = "";
-$a->strings["Existing Page Delegates"] = "";
-$a->strings["Potential Delegates"] = "";
+$a->strings["No potential page delegates located."] = "找不到可能代表页人。";
+$a->strings["Delegate Page Management"] = "页代表管理";
+$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "代表会管理所有的方面这个账户／页除了基础账户配置以外。请别代表您私人账户给您没完全信的人。";
+$a->strings["Existing Page Managers"] = "目前页管理员";
+$a->strings["Existing Page Delegates"] = "目前页代表";
+$a->strings["Potential Delegates"] = "潜力的代表";
 $a->strings["Add"] = "加";
 $a->strings["No entries."] = "没有项目。";
 $a->strings["Source (bbcode) text:"] = "";
@@ -1094,6 +1119,7 @@ $a->strings["Do not import your Facebook profile wall conversations"] = "别进
 $a->strings["If you choose to link conversations and leave both of these boxes unchecked, your Facebook profile wall will be merged with your profile wall on this website and your privacy settings on this website will be used to determine who may see the conversations."] = "如果您选择连接交流和留这两个复选框空则，您Facebook简介墙被在您这网站的简介墙融合和您的这网站隐私设置决定谁能看那些交流。";
 $a->strings["Comma separated applications to ignore"] = "逗号分开的应用要不理";
 $a->strings["Problems with Facebook Real-Time Updates"] = "";
+$a->strings["Administrator"] = "管理员";
 $a->strings["Facebook Connector Settings"] = "Facebook连接器设置";
 $a->strings["Facebook API Key"] = "";
 $a->strings["Error: it appears that you have specified the App-ID and -Secret in your .htconfig.php file. As long as they are specified there, they cannot be set using this form.<br><br>"] = "";
@@ -1129,7 +1155,11 @@ $a->strings["Facebook Post disabled"] = "";
 $a->strings["Facebook Post"] = "";
 $a->strings["Install Facebook Post connector for this account."] = "";
 $a->strings["Remove Facebook Post connector"] = "";
+$a->strings["Suppress \"View on friendica\""] = "";
+$a->strings["Mirror wall posts from facebook to friendica."] = "";
+$a->strings["Post to page/group:"] = "";
 $a->strings["Facebook Post Settings"] = "";
+$a->strings["%s:"] = "";
 $a->strings["%d person likes this"] = array(
 	0 => "%d人喜欢这个",
 );
@@ -1177,12 +1207,12 @@ $a->strings["doubt"] = "";
 $a->strings["doubted"] = "";
 $a->strings["glare"] = "";
 $a->strings["glared at"] = "";
-$a->strings["YourLS Settings"] = "";
-$a->strings["URL: http://"] = "";
-$a->strings["Username:"] = "";
-$a->strings["Password:"] = "";
-$a->strings["Use SSL "] = "";
-$a->strings["yourls Settings saved."] = "";
+$a->strings["YourLS Settings"] = "YourLS配置";
+$a->strings["URL: http://"] = "URL: http://";
+$a->strings["Username:"] = "用户名：";
+$a->strings["Password:"] = "密码：";
+$a->strings["Use SSL "] = "用SSL";
+$a->strings["yourls Settings saved."] = "yourls配置保存了。";
 $a->strings["Post to LiveJournal"] = "";
 $a->strings["LiveJournal Post Settings"] = "";
 $a->strings["Enable LiveJournal Post Plugin"] = "";
@@ -1193,7 +1223,7 @@ $a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "";
 $a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "";
 $a->strings["Enable Content filter"] = "";
 $a->strings["Comma separated list of keywords to hide"] = "";
-$a->strings["Use /expression/ to provide regular expressions"] = "";
+$a->strings["Use /expression/ to provide regular expressions"] = "用/<i>表达式</i>/为输入正则表达式";
 $a->strings["NSFW Settings saved."] = "NSFW设置保持了。";
 $a->strings["%s - Click to open/close"] = "%s - 点击为打开／关闭";
 $a->strings["Forums"] = "";
@@ -1205,6 +1235,7 @@ $a->strings["Randomise Page/Forum list"] = "";
 $a->strings["Show pages/forums on profile page"] = "";
 $a->strings["Planets Settings"] = "";
 $a->strings["Enable Planets Plugin"] = "";
+$a->strings["Forum Directory"] = "";
 $a->strings["Login"] = "登录";
 $a->strings["OpenID"] = "OpenID";
 $a->strings["Latest users"] = "";
@@ -1335,11 +1366,11 @@ $a->strings["Friendica Events: Mine"] = "";
 $a->strings["Friendica Events: Contacts"] = "";
 $a->strings["Private Addresses"] = "";
 $a->strings["Friendica Contacts"] = "";
-$a->strings["Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"] = "";
-$a->strings["Template URL (with {category})"] = "";
-$a->strings["OAuth end-point"] = "";
-$a->strings["Api"] = "";
-$a->strings["Member since:"] = "";
+$a->strings["Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"] = "许用您的friendica用户名（%s）根对外没主办的贮藏（比如ownCloud）。看<a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>";
+$a->strings["Template URL (with {category})"] = "模板URL（根{category}）";
+$a->strings["OAuth end-point"] = "OAuth 端点";
+$a->strings["Api"] = "API";
+$a->strings["Member since:"] = "客人从：";
 $a->strings["Three Dimensional Tic-Tac-Toe"] = "三维井字棋";
 $a->strings["3D Tic-Tac-Toe"] = "三维井字棋";
 $a->strings["New game"] = "新游戏";
@@ -1372,9 +1403,9 @@ $a->strings["Each user chooses whether his/her posts show the post recipients"]
 $a->strings["Startpage Settings"] = "";
 $a->strings["Home page to load after login  - leave blank for profile wall"] = "";
 $a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "";
-$a->strings["Geonames settings updated."] = "";
-$a->strings["Geonames Settings"] = "";
-$a->strings["Enable Geonames Plugin"] = "";
+$a->strings["Geonames settings updated."] = "Geonames设置更新了。";
+$a->strings["Geonames Settings"] = "Geonames设置";
+$a->strings["Enable Geonames Plugin"] = "使Geonames插件能用";
 $a->strings["Your account on %s will expire in a few days."] = "";
 $a->strings["Your Friendica account is about to expire."] = "";
 $a->strings["Hi %1\$s,\n\nYour account on %2\$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"] = "";
@@ -1410,25 +1441,25 @@ $a->strings["Report Bug"] = "报案程序错误";
 $a->strings["No Timeline settings updated."] = "";
 $a->strings["No Timeline Settings"] = "";
 $a->strings["Disable Archive selector on profile wall"] = "";
-$a->strings["\"Blockem\" Settings"] = "";
-$a->strings["Comma separated profile URLS to block"] = "";
-$a->strings["BLOCKEM Settings saved."] = "";
-$a->strings["Blocked %s - Click to open/close"] = "";
-$a->strings["Unblock Author"] = "";
-$a->strings["Block Author"] = "";
-$a->strings["blockem settings updated"] = "";
-$a->strings[":-)"] = "";
-$a->strings[":-("] = "";
-$a->strings["lol"] = "";
-$a->strings["Quick Comment Settings"] = "";
+$a->strings["\"Blockem\" Settings"] = "「Blockem」配置";
+$a->strings["Comma separated profile URLS to block"] = "逗号分简介URL为栏";
+$a->strings["BLOCKEM Settings saved."] = "「Blockem」配置保存了。";
+$a->strings["Blocked %s - Click to open/close"] = "%s拦了－点击为开关";
+$a->strings["Unblock Author"] = "不拦作家";
+$a->strings["Block Author"] = "拦作家";
+$a->strings["blockem settings updated"] = "blockem设置更新了";
+$a->strings[":-)"] = ":-)";
+$a->strings[":-("] = ":-(";
+$a->strings["lol"] = "lol";
+$a->strings["Quick Comment Settings"] = "快捷评论设置";
 $a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "";
-$a->strings["Enter quick comments, one per line"] = "";
-$a->strings["Quick Comment settings saved."] = "";
-$a->strings["Tile Server URL"] = "";
-$a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "";
-$a->strings["Default zoom"] = "";
-$a->strings["The default zoom level. (1:world, 18:highest)"] = "";
-$a->strings["Editplain settings updated."] = "";
+$a->strings["Enter quick comments, one per line"] = "输入快捷评论，一行一个";
+$a->strings["Quick Comment settings saved."] = "快捷评论设置保存了。";
+$a->strings["Tile Server URL"] = "砖服务器URL";
+$a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "一单<a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">公共砖服务器</a>";
+$a->strings["Default zoom"] = "默认变焦距";
+$a->strings["The default zoom level. (1:world, 18:highest)"] = "默认变焦距。(1:世界, 18:最高)";
+$a->strings["Group Text settings updated."] = "";
 $a->strings["Group Text"] = "";
 $a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "";
 $a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "";
@@ -1453,12 +1484,15 @@ $a->strings["Post to Libertree by default"] = "";
 $a->strings["Altpager settings updated."] = "";
 $a->strings["Alternate Pagination Setting"] = "";
 $a->strings["Use links to \"newer\" and \"older\" pages in place of page numbers?"] = "";
+$a->strings["Force global use of the alternate pager"] = "";
+$a->strings["Each user chooses whether to use the alternate pager"] = "";
 $a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "";
 $a->strings["Use the MathJax renderer"] = "";
 $a->strings["MathJax Base URL"] = "";
 $a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "";
-$a->strings["Editplain Settings"] = "";
-$a->strings["Disable richtext status editor"] = "";
+$a->strings["Editplain settings updated."] = "Editplain设置更新了";
+$a->strings["Editplain Settings"] = "Editplain设置";
+$a->strings["Disable richtext status editor"] = "使richtext现状编辑 不能用";
 $a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "";
 $a->strings["Select default avatar image if none was found at Gravatar. See README"] = "";
 $a->strings["Rating of images"] = "";
@@ -1467,7 +1501,7 @@ $a->strings["Gravatar settings updated."] = "";
 $a->strings["Your Friendica test account is about to expire."] = "";
 $a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "";
 $a->strings["\"pageheader\" Settings"] = "\"pageheader";
-$a->strings["pageheader Settings saved."] = "";
+$a->strings["pageheader Settings saved."] = "pageHeader配置保存了。";
 $a->strings["Post to Insanejournal"] = "";
 $a->strings["InsaneJournal Post Settings"] = "";
 $a->strings["Enable InsaneJournal Post Plugin"] = "";
@@ -1487,7 +1521,7 @@ $a->strings["Approve subscription requests from Friendica contacts automatically
 $a->strings["Subscribe to Friendica contacts automatically"] = "";
 $a->strings["Purge internal list of jabber addresses of contacts"] = "";
 $a->strings["Add contact"] = "";
-$a->strings["View Source"] = "";
+$a->strings["View Source"] = "看源代码";
 $a->strings["Post to StatusNet"] = "发送到StatusNet";
 $a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "请联系您的网站行政人员。<br />提供的API URL无效。";
 $a->strings["We could not contact the StatusNet API with the Path you entered."] = "我们不能联系StatusNet API在您输入的路径。";
@@ -1508,22 +1542,27 @@ $a->strings["Current StatusNet API is"] = "现在StatusNet API是";
 $a->strings["Cancel StatusNet Connection"] = "注销StatusNet连接";
 $a->strings["Currently connected to: "] = "现在连接到：";
 $a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "如果使可用的都您<strong>公开的</strong>文章会被发送到有关的StatusNet账户。您会选择默认地这样做（这儿）或个文章分开地写字时候选择在文章设置。";
-$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>注意</strong>: 由于您的隐私设置(<em>隐藏您的简介内容为生看者？</em>)超链接可能包括在公文章转播到StatusNets会带领来客到空白页讲他看您的简介被限制。";
 $a->strings["Allow posting to StatusNet"] = "许放在StatusNet";
 $a->strings["Send public postings to StatusNet by default"] = "默认发送公开文章在StatusNet";
+$a->strings["Mirror all posts from statusnet that are no replies or repeated messages"] = "";
+$a->strings["Shortening method that optimizes the post"] = "";
 $a->strings["Send linked #-tags and @-names to StatusNet"] = "";
 $a->strings["Clear OAuth configuration"] = "清理出OAuth设置";
 $a->strings["API URL"] = "API URL";
 $a->strings["Infinite Improbability Drive"] = "";
+$a->strings["You are now authenticated to tumblr."] = "";
+$a->strings["return to the connector page"] = "";
 $a->strings["Post to Tumblr"] = "发送到Tumblr";
 $a->strings["Tumblr Post Settings"] = "Tumblr发送设置";
+$a->strings["(Re-)Authenticate your tumblr page"] = "";
 $a->strings["Enable Tumblr Post Plugin"] = "使Tumblr发送插件能够";
-$a->strings["Tumblr login"] = "Tumblr登记名";
-$a->strings["Tumblr password"] = "Tumblr密码";
 $a->strings["Post to Tumblr by default"] = "默认地给Tumblr发送";
-$a->strings["Numfriends settings updated."] = "";
-$a->strings["Numfriends Settings"] = "";
-$a->strings["How many contacts to display on profile sidebar"] = "";
+$a->strings["Post to page:"] = "";
+$a->strings["You are not authenticated to tumblr"] = "";
+$a->strings["Numfriends settings updated."] = "Numfriends设置更新了";
+$a->strings["Numfriends Settings"] = "Numfriends设置";
+$a->strings["How many contacts to display on profile sidebar"] = "多少熟人表示在简介工具栏";
 $a->strings["Gnot settings updated."] = "";
 $a->strings["Gnot Settings"] = "";
 $a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "";
@@ -1539,17 +1578,17 @@ $a->strings["Post to WordPress by default"] = "默认地发送到Wordpress";
 $a->strings["Provide a backlink to the Friendica post"] = "";
 $a->strings["Post from Friendica"] = "文章从Friendica";
 $a->strings["Read the original post and comment stream on Friendica"] = "";
-$a->strings["\"Show more\" Settings"] = "";
-$a->strings["Enable Show More"] = "";
-$a->strings["Cutting posts after how much characters"] = "";
-$a->strings["Show More Settings saved."] = "";
+$a->strings["\"Show more\" Settings"] = "「看更多」设置";
+$a->strings["Enable Show More"] = "使看更多能用";
+$a->strings["Cutting posts after how much characters"] = "剪掉文章多少字后";
+$a->strings["Show More Settings saved."] = "看更多设置保存了。";
 $a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "这个网站用<a href='http://www.piwik.org'>Piwik</a>分析工具追踪 。";
 $a->strings["If you do not want that your visits are logged this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "如果您不想您访问这样记录您<a href='%s'>可以用一个cookie防Piwik追踪未来的访问</a>(选择性退出)。";
 $a->strings["Piwik Base URL"] = "Piwik基础URL";
-$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "";
+$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "绝对道路到Piwik安装。（没有协议（http/s）跟斜线后缀）";
 $a->strings["Site ID"] = "网站ID";
 $a->strings["Show opt-out cookie link?"] = " 显示选择性退出cookie按钮？";
-$a->strings["Asynchronous tracking"] = "";
+$a->strings["Asynchronous tracking"] = "异步追踪";
 $a->strings["Post to Twitter"] = "发送到在Twitter";
 $a->strings["Twitter settings updated."] = "Twitter设置更新了。";
 $a->strings["Twitter Posting Settings"] = "Twitter发送设置";
@@ -1561,6 +1600,8 @@ $a->strings["If enabled all your <strong>public</strong> postings can be posted
 $a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "";
 $a->strings["Allow posting to Twitter"] = "允许发送到Twitter";
 $a->strings["Send public postings to Twitter by default"] = "默认地发送公开文章到Twitter";
+$a->strings["Mirror all posts from twitter that are no replies or retweets"] = "";
+$a->strings["Shortening method that optimizes the tweet"] = "";
 $a->strings["Send linked #-tags and @-names to Twitter"] = "";
 $a->strings["Consumer key"] = "钥匙(Consumer key)";
 $a->strings["Consumer secret"] = "密码(Consumer secret)";
@@ -1663,6 +1704,7 @@ $a->strings["Zot!"] = "Zot!";
 $a->strings["LinkedIn"] = "LinkedIn";
 $a->strings["XMPP/IM"] = "XMPP/IM";
 $a->strings["MySpace"] = "MySpace";
+$a->strings["Google+"] = "";
 $a->strings["Male"] = "男的";
 $a->strings["Female"] = "女的";
 $a->strings["Currently Male"] = "现在男的";
@@ -1823,6 +1865,8 @@ $a->strings["Conversations on this site"] = "这个网站的交谈";
 $a->strings["Directory"] = "名录";
 $a->strings["People directory"] = "人物名录";
 $a->strings["Conversations from your friends"] = "从你朋友们的交谈";
+$a->strings["Network Reset"] = "";
+$a->strings["Load Network page with no filters"] = "";
 $a->strings["Friend Requests"] = "友谊邀请";
 $a->strings["See all notifications"] = "看所有的通知";
 $a->strings["Mark all system notifications seen"] = "记号各系统通知看过的";
@@ -1831,8 +1875,9 @@ $a->strings["Inbox"] = "收件箱";
 $a->strings["Outbox"] = "发件箱";
 $a->strings["Manage"] = "管理";
 $a->strings["Manage other pages"] = "管理别的页";
+$a->strings["Delegations"] = "";
 $a->strings["Profiles"] = "简介";
-$a->strings["Manage/edit profiles"] = "管理/修改简介";
+$a->strings["Manage/Edit Profiles"] = "";
 $a->strings["Manage/edit friends and contacts"] = "管理/编朋友们和熟人们";
 $a->strings["Site setup and configuration"] = "网站开办和配置";
 $a->strings["Nothing new here"] = "这里没有什么新的";
@@ -1871,10 +1916,47 @@ $a->strings["seconds"] = "秒";
 $a->strings["%1\$d %2\$s ago"] = "%1\$d %2\$s以前";
 $a->strings["%s's birthday"] = "";
 $a->strings["Happy Birthday %s"] = "";
-$a->strings["From: "] = "从：";
 $a->strings["Image/photo"] = "图像／照片";
+$a->strings["<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a href=\"%s\" target=\"external-link\">post</a>:</span>"] = "";
 $a->strings["$1 wrote:"] = "$1写：";
 $a->strings["Encrypted content"] = "";
+$a->strings["General Features"] = "";
+$a->strings["Multiple Profiles"] = "";
+$a->strings["Ability to create multiple profiles"] = "";
+$a->strings["Post Composition Features"] = "";
+$a->strings["Richtext Editor"] = "";
+$a->strings["Enable richtext editor"] = "";
+$a->strings["Post Preview"] = "";
+$a->strings["Allow previewing posts and comments before publishing them"] = "";
+$a->strings["Network Sidebar Widgets"] = "";
+$a->strings["Search by Date"] = "";
+$a->strings["Ability to select posts by date ranges"] = "";
+$a->strings["Group Filter"] = "";
+$a->strings["Enable widget to display Network posts only from selected group"] = "";
+$a->strings["Network Filter"] = "";
+$a->strings["Enable widget to display Network posts only from selected network"] = "";
+$a->strings["Save search terms for re-use"] = "";
+$a->strings["Network Tabs"] = "";
+$a->strings["Network Personal Tab"] = "";
+$a->strings["Enable tab to display only Network posts that you've interacted on"] = "";
+$a->strings["Network New Tab"] = "";
+$a->strings["Enable tab to display only new Network posts (from the last 12 hours)"] = "";
+$a->strings["Network Shared Links Tab"] = "";
+$a->strings["Enable tab to display only Network posts with links in them"] = "";
+$a->strings["Post/Comment Tools"] = "";
+$a->strings["Multiple Deletion"] = "";
+$a->strings["Select and delete multiple posts/comments at once"] = "";
+$a->strings["Edit Sent Posts"] = "";
+$a->strings["Edit and correct posts and comments after sending"] = "";
+$a->strings["Tagging"] = "";
+$a->strings["Ability to tag existing posts"] = "";
+$a->strings["Post Categories"] = "";
+$a->strings["Add categories to your posts"] = "";
+$a->strings["Ability to file posts under folders"] = "";
+$a->strings["Dislike Posts"] = "";
+$a->strings["Ability to dislike posts/comments"] = "";
+$a->strings["Star Posts"] = "";
+$a->strings["Ability to mark special posts with a star indicator"] = "";
 $a->strings["Cannot locate DNS info for database server '%s'"] = "找不到DNS信息为数据库服务器「%s」";
 $a->strings["[no subject]"] = "[无题目]";
 $a->strings["Visible to everybody"] = "任何人可见的";
@@ -1960,8 +2042,8 @@ $a->strings["Network Posts"] = "";
 $a->strings["Edit Contact"] = "";
 $a->strings["Send PM"] = "法私人的新闻";
 $a->strings["%1\$s poked %2\$s"] = "";
-$a->strings["post/item"] = "";
-$a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "";
+$a->strings["post/item"] = "文章／项目";
+$a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s标注%2\$s的%3\$s为偏爱";
 $a->strings["Categories:"] = "";
 $a->strings["Filed under:"] = "";
 $a->strings["remove"] = "";
@@ -1969,8 +2051,9 @@ $a->strings["Delete Selected Items"] = "删除选的项目";
 $a->strings["Follow Thread"] = "";
 $a->strings["%s likes this."] = "%s喜欢这个.";
 $a->strings["%s doesn't like this."] = "%s没有喜欢这个.";
-$a->strings["<span  %1\$s>%2\$d people</span> like this."] = "<span  %1\$s>%2\$d人</span>喜欢这个。";
-$a->strings["<span  %1\$s>%2\$d people</span> don't like this."] = "<span  %1\$s>%2\$d人</span>不喜欢这个。";
+$a->strings["like this"] = "";
+$a->strings["don't like this"] = "";
+$a->strings["people"] = "";
 $a->strings["and"] = "和";
 $a->strings[", and %d other people"] = "，和%d别人";
 $a->strings["%s like this."] = "%s喜欢这个";
@@ -1993,11 +2076,16 @@ $a->strings["Create a New Account"] = "创造新的账户";
 $a->strings["Nickname or Email address: "] = "绰号或电子邮件地址: ";
 $a->strings["Password: "] = "密码: ";
 $a->strings["Remember me"] = "";
-$a->strings["Or login using OpenID: "] = "";
+$a->strings["Or login using OpenID: "] = "或者用OpenID登记：";
 $a->strings["Forgot your password?"] = "忘记你的密码吗？";
+$a->strings["Website Terms of Service"] = "";
+$a->strings["terms of service"] = "";
+$a->strings["Website Privacy Policy"] = "";
+$a->strings["privacy policy"] = "";
 $a->strings["Requested account is not available."] = "";
 $a->strings["Edit profile"] = "修改简介";
 $a->strings["Message"] = "";
+$a->strings["Manage/edit profiles"] = "管理/修改简介";
 $a->strings["g A l F d"] = "g A l d F";
 $a->strings["F d"] = "F d";
 $a->strings["[today]"] = "[今天]";
@@ -2014,15 +2102,17 @@ $a->strings["via"] = "";
 $a->strings["toggle mobile"] = "";
 $a->strings["Bg settings updated."] = "";
 $a->strings["Bg Settings"] = "";
-$a->strings["Post to Drupal"] = "";
-$a->strings["Drupal Post Settings"] = "";
-$a->strings["Enable Drupal Post Plugin"] = "";
-$a->strings["Drupal username"] = "";
-$a->strings["Drupal password"] = "";
-$a->strings["Post Type - article,page,or blog"] = "";
-$a->strings["Drupal site URL"] = "";
-$a->strings["Drupal site uses clean URLS"] = "";
-$a->strings["Post to Drupal by default"] = "";
+$a->strings["Post to Drupal"] = "发到Drupal";
+$a->strings["Drupal Post Settings"] = "Drupal设置";
+$a->strings["Enable Drupal Post Plugin"] = "使Drupal插件能够";
+$a->strings["Drupal username"] = "Drupal用户名";
+$a->strings["Drupal password"] = "Drupal密码";
+$a->strings["Post Type - article,page,or blog"] = "文章种类－文章，页，博客";
+$a->strings["Drupal site URL"] = "Drupal网站URL";
+$a->strings["Drupal site uses clean URLS"] = "Drupal网站用整洁URL";
+$a->strings["Post to Drupal by default"] = "默认地发到Drupal";
 $a->strings["OEmbed settings updated"] = "OEmbed设置更新了";
 $a->strings["Use OEmbed for YouTube videos"] = "用OEmbed为YouTube视频";
 $a->strings["URL to embed:"] = "URL要嵌入：";
+$a->strings["Tumblr login"] = "Tumblr登记名";
+$a->strings["Tumblr password"] = "Tumblr密码";